gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-sound
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
88 files changed, 1583 insertions, 1559 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 116d82f5b669..13d5b6fc8600 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 1ba4a8d39cd7..f2480b5b0393 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,6 +1,4 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
-DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
-EBUILD alsa-tools-1.1.7.ebuild 3582 BLAKE2B 11ac1868daffdd46fa1b2773d30df9e8549a25da2fc7758ae1ae300951a259622819ea5b09074ed41d9349344afd1b07c871498f403ceaaf4554390e4ffa8f31 SHA512 f2f631c6b3d9b11df7cc7a1fdb89f3453fd51771a4b2a6237a922887ad462e83b9739dc38ca48c42f039b855b3df48b36c30cd49f6b9f3904c35234cc37fb180
 EBUILD alsa-tools-1.2.2-r1.ebuild 3406 BLAKE2B 96ba11cb4d70c6231b0a1b41251969b343276ae6b6678a260b1b38c8c2ecfde681e2f6a97f1ed7b4032d234748d98e3f1858d282008d9d3e9b075de0042765a5 SHA512 4036014c982680d69f5d337f597d79d5e42ba4fb1ae88abfd866f996cc4b042dfc6f04621697c22b1990918491734ff4eb5eb15d3b18312ea182a92ea85e7d5b
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
deleted file mode 100644
index 71a66dbc3ad8..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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
-
-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="~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}
-	>=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"
-
-PATCHES=(
-	"${FILESDIR}"/envy24control-config-dir.patch
-)
-
-pkg_setup() {
-	ALSA_TOOLS=(
-		seq/sbiload
-		us428control
-		hwmixvolume
-		hda-verb
-		$(usex alsa_cards_mixart mixartloader '')
-		$(usex alsa_cards_vx222 vxloader '')
-		$(usex alsa_cards_usb-usx2y usx2yloader '')
-		$(usex alsa_cards_pcxhr pcxhrloader '')
-		$(usex alsa_cards_sscape sscape_ctl '')
-	)
-
-	if use gtk; then
-		ALSA_TOOLS+=(
-			echomixer
-			hdajackretask
-			$(usex alsa_cards_ice1712 envy24control '')
-		)
-		# Perhaps a typo the following && logic?
-		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
-			ALSA_TOOLS+=( rmedigicontrol )
-		fi
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
-		ALSA_TOOLS+=(
-			hdsploader
-			$(usex fltk 'hdspconf hdspmixer' '')
-		)
-	fi
-
-	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
-		ALSA_TOOLS+=( sb16_csp )
-	fi
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS+=( as10k1 ld10k1 )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# 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}" || die
-		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}" || die
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS[@]} ; do
-		# Install the main stuff
-		cd "${S}/${f}" || die
-		# 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)
-	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
-}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0fb9c63629e8..00a11ca7b0a9 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -3,8 +3,8 @@ AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
-EBUILD alsa-utils-1.2.1.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
+DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
 EBUILD alsa-utils-1.2.2.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
+EBUILD alsa-utils-1.2.3.ebuild 2341 BLAKE2B d3634b987e5fe5917a2f5e336ef9603a141fc67b1e7a89d258ffaa7c04d5b674613f7232d8d6b1f00f687a0471ab8bdeb28e7e2eb4164a9f9e5b098cac614b43 SHA512 73cf0447b2e8e97e8d53d518a37a637ae939e6a9640a198847bc7be8e60d13e690ea5ba53691f837cf8e981fdd7b542fc4577f6fafb598285361cb46677ba9c8
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
index 13b172c0891b..24b8ba3949fe 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index d911e70b0518..96772ec558e6 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,5 +1,4 @@
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
-EBUILD aqualung-1.0-r2.ebuild 2416 BLAKE2B b9ae5b18dcb07968ca9378c725e84fbae5b162003ed00ad07520ad8ec235df0aea7a3352f06e2dbb768f9a568431deea078e2e1e0603f59a0c72bcecb1ae0469 SHA512 dda2dd55f4ab1f37e28bc4c98d4b96ac2995706d01b9c8669e9c21a216ae5807643583666ea39ae306afe2e8960420b148a638c2341b96626b2d1b0897f5f85a
 EBUILD aqualung-1.0-r3.ebuild 2422 BLAKE2B 8fcce45ccc5062d388cd9c65d544e3baab1ec5a474b4fac3a4655cb0586b60458260c3d43083a0da855e18ea1ea10db39f2eb8533dbe73c4c7ce72d516ae84f4 SHA512 0ddbbefa25223761470a898eca0a08bafa6398ad467e681618d91b0886643d97aa6001596f4dff2942e2182b6dac2020a1e36d9e32b52b60ebb0de225f38059b
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild b/media-sound/aqualung/aqualung-1.0-r2.ebuild
deleted file mode 100644
index ce1efdd48678..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( >=media-sound/mac-4.11.4.5.7 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 510b98efcde0..cd4fabb9933f 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,9 @@
 DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
 DIST audacious-4.0.3.tar.bz2 577512 BLAKE2B 55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18 SHA512 e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd
+DIST audacious-4.0.4.tar.bz2 577440 BLAKE2B a51766ea61e91244eda39f77710f5489641d7e8a12332eb2e5b254b2dbc5360196beba040fa453fbb992d8815cd002604fd542d88f53dec3651645cc5e697dcc SHA512 76bafb2cece861b58650e52cc8c338a0645387e43b7d3548b23528024195605c11789479d8fb2ae25d5986cd5ccb03182eb2427c9ba394d4fd6611f06359f94d
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1-r1.ebuild 1696 BLAKE2B 09463aa9d83d1d610ea48321f81783dc2127d3be5b8d4574cc96d7edaebbbe8b88cf025aa4a8606cb2c6a4ce6745a59bc0f787203c66f07735dfd5732152aa5a SHA512 f31880f63020fb113020bf60a59f187117d1f60e545102da755615419affbd5599ce97c856e80541b1db67346855081ee0ec220584effa252d5f534534fe98aa
 EBUILD audacious-4.0.3.ebuild 1766 BLAKE2B 4977dcdedca220fd9de9760af086e9195aa4fdd9bb7fc3547b529cdb569b73fc5c9fc5b0ffaccfd4d3e725f82d602f4e161d85c41996ba1103272cad2771714d SHA512 1f983f029630e6da151a176ee69968983e5abd6c9cb7164c783c1296353c7d633aab4f09410751a9dc7d3276128606c06b57f7198693039b9cdfe217aaa424e4
-EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
-MISC metadata.xml 448 BLAKE2B e90c79db8c6985ab2da4be826285a87e8835d25227bf36e912a9d28c230336a09b7fb10f9421f5a465ad22e1c60b4efa011d8917ee8024e60ff256a85534c7d9 SHA512 6e66d8e10bfa07d68a7ca02a6064959f77c7d698473b27eff114b9646e470810a5c115da3fbda71589fcd355db579edc77ae594c4f89f89267c18e7461d03401
+EBUILD audacious-4.0.4.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+EBUILD audacious-9999.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+MISC metadata.xml 367 BLAKE2B 3178261eacb8e350e8930e69bc03206952775a7cf98bc2da66d6b28413940bb00c2c485302637a70fdd4591ee0cc324d0c92934f403b844928bc2a5c17e98da8 SHA512 557d6cef39796075cf75208ef91e02ed32e6906929fa4f4408798e4a56ced6e472069aedcdda7c2276d89c2732d7c2832b79f514bd77b7147b25487e3f217b87
diff --git a/media-sound/audacious/audacious-4.0.4.ebuild b/media-sound/audacious/audacious-4.0.4.ebuild
new file mode 100644
index 000000000000..13924b39fcb0
--- /dev/null
+++ b/media-sound/audacious/audacious-4.0.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	local myeconfargs=(
+		--disable-valgrind
+		--disable-gtk
+		--enable-dbus
+		--enable-qt
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index edf35f502de2..13924b39fcb0 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-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
@@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk nls"
+IUSE="nls"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -29,15 +29,12 @@ BDEPEND="
 DEPEND="
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.28
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
 "
 RDEPEND="${DEPEND}"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
@@ -65,9 +62,9 @@ src_configure() {
 	# Bugs #197894, #199069, #207330, #208606
 	local myeconfargs=(
 		--disable-valgrind
+		--disable-gtk
 		--enable-dbus
-		$(use_enable gtk gtk)
-		$(use_enable !gtk qt)
+		--enable-qt
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 42ef143d3440..30869dd2bbde 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -9,7 +9,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<use>
-		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 1d7d5adb03cf..5455e672b0b9 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,4 @@
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r1.ebuild 3557 BLAKE2B c2374c28f18396541d8e473b8d0f2a4f7d9d6dd2cdd33c2e73e0504810fa21a77af3652ff6f377d79fe9bb4d762c6356416ab77430be70cbaf9e07378b8d76fb SHA512 70cbf115007ee7420fcf0ddae6185863547ba8d53ce86885a6a7d723a899d280373796fe6583523774e6bf5160199c6ceace0223162f73c592a6835f65a06962
-MISC metadata.xml 2480 BLAKE2B 362b835a16709336e8d6fc8858505107a4d060afb66dab31211daa664e942f7475626c462b4ded6738f600ccb14b92e0b2250256daae019da873d6cc7d18cf5f SHA512 1eae06f009e93147c6d63a0125003b00c8e6569ccc90d491bf7bf129bfcd10bfb87f82db35221bfb1f15c2db83b4f99a5ab2119f585ebbfb33358341a99fa12b
+EBUILD beets-1.4.9-r2.ebuild 4825 BLAKE2B 0c33fb87a1c6aa41b1d8ced8aacfb103ab838b39c8718d7f85ae8571d906c22fed3e5362a322009a7483e08bd742a30265ccfd1c346674f32eeccd8253661bbb SHA512 8dc35097441730c9be57364488b9ce7e09e7b8e516d2863888e2cc6805336bff6d0f744ec2bd80150e605513fbd9dfb0ed9050eee730ecaa128f2d6f71e0726f
+EBUILD beets-9999.ebuild 4939 BLAKE2B e2cd86d2abf9a8ada1e1421c62199b91ee10eae10f6bc4d35c780b07aa9a8d483863eb4dabbed79c8728c744ecb0a3acf6a9e3cd2073ad8f8bfc5da069678c1e SHA512 6f436b1e1487d07069f4d5a198c9671f1a20c482837ecff8ed6203f095c931ac319fc39aa7d92f5cb0057d09bfa3d22a3250508b02f03d074378a50329868986
+MISC metadata.xml 2696 BLAKE2B 7b78276fdc266ce63a0a89b6234119b01dd8bc39509610e66310683a5f3ad862a598f33243c699eed4ce56bb06630793e8920dc3651c771127ecbeb3b52ed9f4 SHA512 cba68bb5facea99bab3e50051f60c51a4ecb9200324925c7a4bbdaf9b7574c27db29b63ae88db1224240ebe33231565fab658196e199ea7a10c95ff8fc80ed5f
diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
deleted file mode 100644
index c8b7ae1874fe..000000000000
--- a/media-sound/beets/beets-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
-	dev-python/munkres[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-	badfiles? (
-		media-libs/flac
-		media-sound/mp3val
-	)
-	chromaprint? (
-		dev-python/pyacoustid[${PYTHON_USEDEP}]
-		media-libs/chromaprint[tools]
-	)
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:0[encode] )
-	gstreamer? (
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-	)
-	icu? ( dev-db/sqlite[icu] )
-	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	mpd? (
-		dev-python/bluelet[${PYTHON_USEDEP}]
-		dev-python/python-mpd[${PYTHON_USEDEP}]
-	)
-	replaygain? (
-		gstreamer? (
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			media-plugins/gst-plugins-libav:1.0
-		)
-		!gstreamer? ( media-sound/mp3gain )
-	)
-	thumbnail? (
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pillow[${PYTHON_USEDEP}]
-			media-gfx/imagemagick
-		)
-	)
-	webserver? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/flask-cors[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test" # tests broken in 1.4.3 already
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	rm_use_plugins() {
-		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
-		local use=${1}
-		local plugins=${use}
-		use ${use} && return
-		einfo "no ${use}:"
-		[[ $# -gt 1 ]] && plugins="${@:2}"
-		for arg in ${plugins[@]}; do
-			einfo "  removing ${arg}"
-			if [[ -e "beetsplug/${arg}.py" ]]; then
-				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
-			fi
-			if [[ -d "beetsplug/${arg}" ]]; then
-				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
-			fi
-			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
-				die "Unable to disable ${arg} plugin "
-		done
-	}
-
-	rm_use_plugins chromaprint chroma
-	rm_use_plugins ffmpeg convert
-	rm_use_plugins icu loadext
-	rm_use_plugins lastfm lastgenre lastimport
-	rm_use_plugins mpd bpd mpdstats
-	rm_use_plugins webserver web
-	rm_use_plugins thumbnail thumbnails
-
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in badfiles discogs replaygain; do
-		rm_use_plugins ${flag}
-	done
-
-	if ! use mpd; then
-		rm test/test_player.py || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test || die
-	if ! use webserver; then
-		rm test_web.py || die "Failed to remove test_web.py"
-	fi
-	"${EPYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/beet.1 man/beetsconfig.5
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	einstalldocs
-}
diff --git a/media-sound/beets/beets-1.4.9-r2.ebuild b/media-sound/beets/beets-1.4.9-r2.ebuild
new file mode 100644
index 000000000000..6fa58e40129d
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="${DEPEND}"
+DEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+			dev-python/responses[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+		badfiles? (
+			media-libs/flac
+			media-sound/mp3val
+		)
+		chromaprint? (
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+		)
+		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg:0[encode] )
+		gstreamer? (
+			media-libs/gst-plugins-good:1.0
+			media-libs/gst-plugins-bad:1.0
+		)
+		icu? ( dev-db/sqlite[icu] )
+		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		mpd? (
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+		)
+		replaygain? (
+			gstreamer? (
+				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+				media-plugins/gst-plugins-libav:1.0
+			)
+			!gstreamer? ( media-sound/mp3gain )
+		)
+		thumbnail? (
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
+		)
+		webserver? (
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+BDEPEND="dev-python/sphinx"
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins icu loadext
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm test/test_player.py || die
+		rm test/test_mpdstats.py || die
+	fi
+	if ! use webserver; then
+		rm test/test_web.py || die "Failed to remove test_web.py"
+	fi
+	if use test; then
+		# Those test need network
+		rm test/test_art.py || die
+		rm test/test_discogs.py || die
+		rm test/test_embyupdate.py || die
+		rm test/test_lastgenre.py || die
+		rm test/test_spotify.py || die
+		# rm test/test_plexupdate.py
+		rm test/test_thumbnails.py || die
+		# Not working
+		rm test/test_replaygain.py || die
+		# Not working
+		rm test/test_convert.py || die
+		# Not working and dropped in master
+		rm test/test_mediafile.py || die
+	fi
+}
+
+python_compile_all() {
+	esetup.py build_sphinx -b man --build-dir=docs/build
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/build/man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
+	newbashcomp "${T}/beet.bashcomp" beet
+}
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
new file mode 100644
index 000000000000..01d7ec3b1be1
--- /dev/null
+++ b/media-sound/beets/beets-9999.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="${DEPEND}"
+DEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+			dev-python/responses[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/confuse-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mediafile-0.2.0[${PYTHON_MULTI_USEDEP}]
+		badfiles? (
+			media-libs/flac
+			media-sound/mp3val
+		)
+		chromaprint? (
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+		)
+		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg:0[encode] )
+		gstreamer? (
+			media-libs/gst-plugins-good:1.0
+			media-libs/gst-plugins-bad:1.0
+		)
+		icu? ( dev-db/sqlite[icu] )
+		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		mpd? (
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+		)
+		replaygain? (
+			gstreamer? (
+				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+				media-plugins/gst-plugins-libav:1.0
+			)
+			!gstreamer? ( media-sound/mp3gain )
+		)
+		thumbnail? (
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
+		)
+		webserver? (
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins icu loadext
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm test/test_player.py || die
+		rm test/test_mpdstats.py || die
+	fi
+	if ! use webserver; then
+		rm test/test_web.py || die "Failed to remove test_web.py"
+	fi
+	if use test; then
+		# Those test need network
+		rm test/test_art.py || die
+		rm test/test_discogs.py || die
+		rm test/test_embyupdate.py || die
+		rm test/test_lastgenre.py || die
+		rm test/test_spotify.py || die
+		# rm test/test_plexupdate.py
+		rm test/test_thumbnails.py || die
+		# Not working
+		rm test/test_replaygain.py || die
+		# Not working
+		rm test/test_convert.py || die
+	fi
+}
+
+python_compile_all() {
+	esetup.py build_sphinx -b man --build-dir=docs/build
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/build/man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
+	newbashcomp "${T}/beet.bashcomp" beet
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 00d7ac2d1354..544682635755 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>guillaumeseren@gmail.com</email>
+    <name>Guillaume Seren</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
         The purpose of beets is to get your music collection right once and for
         all. It catalogs your collection, automatically improving its metadata as
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index fa2e8706b214..2ac6c0bc7a90 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -2,5 +2,5 @@ AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114
 AUX din-43.0.1-makefile.patch 552 BLAKE2B c73746b64789dc54f4186777d507fc77c9a0b25e025be4adb48c4620adf4560ef600a445a8822ac045b0a39b4003c5b9007b5a36ed97fd61cdc6a1b8d96bdf74 SHA512 408d71e3b1e262eb83cc6cf0cd3ab4ee164bb9a6fda5244a6445d627c53b23e3d3d3e64bfb9f2c69e8168ecda0a46f8b4768100710f219a8b78325d238af4207
 AUX din-44.0.2-makefile.patch 590 BLAKE2B 6fedfe655ae6a977da3b94d4e7ec9863ea679860a23f6bc7dacfc7e9099a63c9cf0f7b264e13544ea13b2ec491a0b561fe757dc67f40ac373fecda6c3a76ff2a SHA512 30ac7595fe33a8ce3b32df857f610719ff55fa97a8f3fbb90cffa17cdbddcdf4f90e282ec1e5619440301ac34c0474c28ec891a71c169772d9d0fe6bf36e6e74
 DIST din-44.0.2.tar.gz 3652445 BLAKE2B 2b8dab2c4f4c22442bf446c7f43fdcff911c6b245950a9b06c9c0eaffa7138dd276900e58cef4cd21fabf9488bc5e56080f60c38af33eb9d4a6486019ff4b76c SHA512 a90c6d4d2e1817f8a740ad849f27f2b2f2c2e879107f6edf5bb49ecbb8168eb3c742db9984b9df43df7c49dd6273a947271e80fb2ac6d8300125e6cb35720de8
-EBUILD din-44.0.2.ebuild 1083 BLAKE2B 776a2e4500e817862b024749a0ba26e1a153838bceb50d5939dc2d471a8d5fb9d24ac0396dfee166358696a2cd1037f93d6c0bb9062c2b01e718df8e78410f7c SHA512 a958b2547c0e4ea3768c5efb666e13c3ff1f16f7f70a48b2f1c52eebef46b33ec3217209055fbee7c5874e34dbb818ef14f7bc3da6c5b184b8a46e3639f35398
+EBUILD din-44.0.2.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-44.0.2.ebuild b/media-sound/din/din-44.0.2.ebuild
index eaec2db6bdc2..a67d55f2e191 100644
--- a/media-sound/din/din-44.0.2.ebuild
+++ b/media-sound/din/din-44.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools eutils xdg
 
 DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="http://dinisnoise.org/"
+HOMEPAGE="https://dinisnoise.org/"
 SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index f305d9432cc6..503c769ccee1 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-3.34.5.tar.xz 1415240 BLAKE2B 3545541171b023da116ebee5d28a2b69b6b45677cde26c833ea0992ba9bc41d4792375dbf3617105da53f0e98d21576e166980e896527a60d47c92690b343a27 SHA512 c4f3c8cd7e8a6d24d3766672acfe3abc340d0cd305ba0d3d0a87c02b5a5f9e8c47bee9d8284e76ad28c51eeebe56e3163f4e5c34c89e294801d0047b8476f80f
+DIST gnome-music-3.34.6.tar.xz 1415360 BLAKE2B 0b8f3a2b17242f41f3a77a9eeb60cf1f10cac57d983de6e7f44ba1a243526e0831ee2ad5baec17b726bbbe9df52e26b79dedc2b2abe4dba87c59cc4fcd4a083f SHA512 76561adf8c6ce4342825eb976de11c98c2aa66cb08075dbe46d8c7787daf7fc77763d55c2fe475dd9c75536adc98f8afbdd90bfb2b64791d05cdf11e3ed00b03
 EBUILD gnome-music-3.34.5.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791
+EBUILD gnome-music-3.34.6.ebuild 2035 BLAKE2B c6fe49d24527a9fb61a3c3e166164a86ec5598a54247275e9e145c1da15c2679bd7ef2f0af6601fab44b793859e719df78536f326f40b725eea9a79a2bb38c58 SHA512 0c7e7a9a847e7c79aba6a50205b9fbf7df8d9d8bb0b7741303765c61684b66def80fdeaf379ce96592819a765ea3e3ba24c09aad1061706cc00fcd075a4b2de6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.34.6.ebuild b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
new file mode 100644
index 000000000000..fde8cf288529
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.34.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	net-libs/gnome-online-accounts[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.24.7:3[introspection]
+	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=app-misc/tracker-2.2.0:=[introspection(+)]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.9:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.9:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		>=app-misc/tracker-miners-2.2.0[gstreamer]
+		>=app-misc/tracker-miners-2.2.0[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 52bbbf188db4..a445d85c572d 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,5 +1,3 @@
-DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
 DIST grip-4.1.1.tar.gz 1211196 BLAKE2B 677ace9ef740db150a2cfc9b597b148b50015dda79cb41b53cd656451b038ff71d6efdf3e17bea65accc071ec0116c6025a7c9619cb09a3782eeb94904e431a9 SHA512 c6af48b0fa89fb342c73614c6193973811ccf72837a46eb1a3971ffcfa9a20bb4fb8705ba674b093e2c4f6f78f9ded323cf5453cdecf53c467238430f98ba267
-EBUILD grip-4.0.1-r1.ebuild 1141 BLAKE2B ec212c5bdcfabdafa9205f8880c01c50a8404c864243dd54474333a7c479b6eafb3e27e17afc9093a46efd5c8127185c01f30e62c4a11cb2ca9481b17188f872 SHA512 fd45655be378d498cc16ad51c2ab141d72dbf5924bcef19f3d8ee0a9088629cfae10427ffad6356f4c7509df5a3176633f1c0d99edcd42482f7e2b26871b4f9c
-EBUILD grip-4.1.1.ebuild 1077 BLAKE2B a6f56d13e778378eae796dc090b04152d148db998a0ee1416ca8d680e57a618298a8a2428d80d9d029fee64962fdf74230f9ed84cbce82ab57a1a5ee0b5a3edd SHA512 136db8127b80a40c0e19abd3ba59a597b190c1e81337e1aae4e304c83a4dc8f243c1eea3c96e60a647d321d497a21acd43be8090cbe8d14ec02943af1bb5e73d
+EBUILD grip-4.1.1.ebuild 1072 BLAKE2B 1b7d04469b4266a000a6b079f93fac4c0a3107d226fd051d1dc651abe54a07b55b1087f143dc5ea6914d326d4d58c5eabebbb3e2e0762bfd3a25c0da15d29f3c SHA512 b1999167ec68c632d214a899fd1b1078c8bbe4b9d2636d10a93f95dd7a8b5973613f5212d9baacbb81a4346161a18b914bd4fab363a9c4cdd671d7b024c3a92d
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-4.0.1-r1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
deleted file mode 100644
index 992f5cdd3e13..000000000000
--- a/media-sound/grip/grip-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf --disable-werror
-}
diff --git a/media-sound/grip/grip-4.1.1.ebuild b/media-sound/grip/grip-4.1.1.ebuild
index ea1d05e4b634..de4b4a0ec027 100644
--- a/media-sound/grip/grip-4.1.1.ebuild
+++ b/media-sound/grip/grip-4.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
index e7213981531b..2736605012d1 100644
--- a/media-sound/jack-rack/Manifest
+++ b/media-sound/jack-rack/Manifest
@@ -5,5 +5,5 @@ AUX jack-rack-1.4.8_rc1-noxml.patch 492 BLAKE2B bfb74018767f8e08dd27b93531e848d5
 AUX jack-rack-1.4.8_rc1-underlinking.patch 315 BLAKE2B 656898ba9367cd0eeecc1f4183c852676cff35de4350e42db75c8dbede502511b94fa34813e8fd5b5281e04d1d9df684a2c1e5c4bc61e92147c478f3910f3203 SHA512 db0353aab452a5f59b411085740f8fd2a115afb690c481eb2dd2ea6609887ad36114bea9148c73ff1bfea2cd04a34f01d2c5b16a4f8a411f854d53431df31163
 DIST jack-rack_1.4.8~rc1-1.debian.tar.gz 6742 BLAKE2B 51d5336878b7a6957822395dd282872c1681dfce9c54af569d311c40f612240f0db90812fc6dc2364c0a259f6c1ed8623e9fe5be6dd21fc4574674048d6b13f6 SHA512 4e0503a0b1fa080bed0f9730929d820d173d886f4d4801016419d33729ec453f1f4e0f96fe102d83731169b91c54939663e9529516fdc09bca5d347be3e18715
 DIST jack-rack_1.4.8~rc1.orig.tar.gz 122400 BLAKE2B 93367eb01c5079a855a55f976205901b0f9536929424e04b1c4a7c6d620d2d7e93c3475cd46cd6bd17995d2c2b77ca5b1b342166c7098b817a3a53843b48a51a SHA512 8c7be402b6c8ad02a6ad7379d98c49a00bf5a3c70e5e5c174d786e77bf72592cf2eec6b346ce77d1dabb3787a6d028f4d02a1dd18daa5bf3daa297ac7bd7ad38
-EBUILD jack-rack-1.4.8_rc1.ebuild 1583 BLAKE2B 082d8840b6f5bddb4575efe246e0e8eb98b0872f1cd2c9caf6029cca24949f447a9b83dad0ae6b854e7d47e94da303a622bd3ff4079fe939dcc5cdb2738450f2 SHA512 dcd83c9992147ac9e72cd7796c1ff90df12bb8c9c9870856ed62e2d96b6f241d1ed91055083dee6601d730950b4d88d342b0564ed5a7813caf6ce8fe9bce0906
+EBUILD jack-rack-1.4.8_rc1-r1.ebuild 1537 BLAKE2B 3ef413b66e565a7a7b181c41abff9a49b7bb1a66d33350c688a63317909dc3f2f644d71c5d95ea1dea60111516f78b2ecaeddd1c8d8ddf35a943fc3a3f32a7ae SHA512 935f0a1ecfbd70a41d8f56bd741ccd04ad9c30edfd36cb518a1c3a4ec692a95a2e05182fe74ba9702f0d961b415e837acc1025f4809fe85e437f1c897fde058c
 MISC metadata.xml 338 BLAKE2B 0f7169d20fe0dd2ebd07b886c6f3973283e61e0ccfcfba61a9065209666d3ec1e0b14f3367f283d57d320f4006ae8b9ffc454390e2d5f5df494b691b74eaa23a SHA512 5274213ba5e9a2710d7e0d1e11150e45d902e2ac263ef21359046afc774d7fc4b7aea86705a49a0ae39b9adfd6c4103d450ccb737defe2eee1078bf3d3819c51
diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
index 002b6ccc6f6d..f92eced8b109 100644
--- a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1-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
@@ -15,7 +15,7 @@ SRC_URI="${DEB_URI}/${MY_P}.orig.tar.gz ${DEB_URI}/${MY_P}-1.debian.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa gnome lash +xml"
+IUSE="alsa lash +xml"
 
 RDEPEND="
 	media-libs/ladspa-sdk
@@ -23,7 +23,6 @@ RDEPEND="
 	virtual/libintl
 	x11-libs/gtk+:2
 	alsa? ( media-libs/alsa-lib:= )
-	gnome? ( gnome-base/libgnomeui:= )
 	lash? ( media-sound/lash:= )
 	xml? (
 		dev-libs/libxml2:=
@@ -59,7 +58,7 @@ src_configure() {
 
 	econf \
 		$(use_enable alsa aseq) \
-		$(use_enable gnome) \
+		--disable-gnome \
 		$(use_enable lash) \
 		$(use_enable xml) \
 		$(use_enable xml lrdf)
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 1ecb2bdd402b..152b0de680af 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
-EBUILD jack2-1.9.14.ebuild 2365 BLAKE2B 74db2267ceac7e74f31685257150300fcd797e8b0bbc95e985285ae51d33c025d87ae232996301e13e41db6ab0bb1b4171114cea5653a72807aa0d5f3c491b63 SHA512 fef8b7107cc6009d88406cb8c55982364cfe5dca6daa41186474cbd63b91b633556fe5f349bcb686ca8791835993aba30f4af89bf60a5f9e043f6822b706d692
-EBUILD jack2-9999.ebuild 2405 BLAKE2B b7596a88181d71921c48b5e72542fc454cde1d94f3694304bb9f8edc6a920ba9e21a0b8be9ff47924ef16311cfaddca8ce7d6b9b30676ccdea55eb6dd5459776 SHA512 afc96552b9592ac158259fd1b107317040102f8609d138638009df9307cddf6b10223a9d382b51ddbcac31d5a03fe8093be584d5b483e5761909fb980fdc9d9b
+EBUILD jack2-1.9.14.ebuild 2366 BLAKE2B f4c6acad4ecfc5b5810adcfb8a4e71208295e2fc7ebaeaf776758792df978496310af3af9fce36b890b3436ef2618fafb7dc40fa4f42459e470759b1e6441130 SHA512 fcf627cadbba9eec3021f599d6051791a8e3cefb28ee668691e2f9cd007a2dd1735fb863936af1d83bc5626dd1416e8c270ef3e1405d537a9ea5b2e51b19687b
+EBUILD jack2-9999.ebuild 2406 BLAKE2B 4cf6581a7cf3bf8e9a60dd063fbe8d0dd2cad8734e91ff09c08c4af5431502d9f30f65a3571bf3f5e2b589a31da31b3aecf8f62338496a52d1caa20caa480744 SHA512 0abe0f5bee6a76730cd21737e6391783b1f2109b82a0b80ccf9cd2d72d5b6e2dcb52daf55465d5032882968c41da0e0f154c97386cb1c4d66e4d3d2c39aa8132
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.14.ebuild b/media-sound/jack2/jack2-1.9.14.ebuild
index 82190f07ebaf..828b602a1d16 100644
--- a/media-sound/jack2/jack2-1.9.14.ebuild
+++ b/media-sound/jack2/jack2-1.9.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
+HOMEPAGE="https://jackaudio.org/"
 
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 4259cdfc0dfa..a05c1b121090 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
+HOMEPAGE="https://jackaudio.org/"
 
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 82fa98eeb851..cddef8a23359 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,10 +1,6 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
-AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de1fda31cce3901999c6fc1f5ec05fcc1dad5a60b4df4823eb9e5e809e4bfd863eef7088627e8dbab38fc1b2fe10152d9c26965c934 SHA512 0098b5f7fae77bd39f08397b460efc43bed8ea90feb2afd5349cb3459209720111bba657ca04be9781d5ad2731476887b6a9414690842d455e22f3c9ed6faeed
-AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
-DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75
-EBUILD lilypond-2.19.83.ebuild 3405 BLAKE2B 0409cf9038b396d0ee6df6cc65c7f5a9fdddd40f533cd4a7b76adf8ba9e65d4ca8e0d7bf3f831f94f2e681011cd7f8427eb105fd1b8759b50c0838a4f4b4febf SHA512 90d9a385992975fd9fa228bbfe886560711594b1a5c53d71d0291f842631fabe7e957db28ae8417d323f7c7f9aacaeb5eedd3cb25321413878c15b62b8c947a0
-EBUILD lilypond-2.21.1.ebuild 3215 BLAKE2B 9e3e76fff187953f7549583cfaece5e8355bdd95495a64745807ad0500a056b6faa0846c4632bb08406748876d857db6ed652164beca89cd2aaf2345d34ab172 SHA512 5a1a37f3cc74638ecf3ebeb0694acec52bc68b74873ff276fb92682c504188bba8954cf4153e3b9326bed628b06d5f213df0972b3b091a529e4c4b1257f8c745
-EBUILD lilypond-9999.ebuild 3223 BLAKE2B 5026b74a5129cd1482e8b033be13141c7d832445d228cb0b7042732b7b73a0705ed7cd014ff32eaa5e7282b70d22ec5f7d337673702f58d9859014e6669e0404 SHA512 9b5ba89e24ac4c26141de4330b94d7514f789d591ca2217f2b7ecb6e04ef55195534a49931bc7ec1e307507c70026e145a1b0e1925fbe746ac9f7ca0bbac9b91
+EBUILD lilypond-2.21.1.ebuild 3221 BLAKE2B 33351791371ec81926732bbd0fb5d85f2835e3c3548f85a9e3eb9ecdfacbc5bd545c00ec720ad7836d38d4c2dd2ef8ad1d99ad04b8bcbf230bd502268c84c473 SHA512 8cc9002fd62a60f71a3d404c873fd5149c1da6e83e3bede9303cef2f0a2724e60bf6997da2c944cc0e17a576728e185031e1e1e2172ec55f93c6a055017aa23f
+EBUILD lilypond-9999.ebuild 3232 BLAKE2B 136ffb23d241355358c792690d96a6e40b2c641c6180bfc2b513a2ae6defc228301b08530a4d8f271b76b245a722d0b85c3637193d6db9e0b68c7fa6b7ad3fb8 SHA512 5c95e8e885f9d9ee77bf469763fc738703aeba5f1580218d3b2144c56b0a1cae0f7a3b2bf0671eb4e6ab01eba8e844057763084990c073dff07bd2ea271edd41
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
deleted file mode 100644
index 4e2c2ce77c12..000000000000
--- a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The version test fails for two reasons:
-* fontforge --version does not print anything that resembles what the configure
-  script expects a version to look like
-* fontforge fails to print a version if it cannot connect to an X display
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -236,7 +236,7 @@
- 
- STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0)
- 
--STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222)
-+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED,)
- 
- STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
- 
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
deleted file mode 100644
index d21b0a413a12..000000000000
--- a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc
---- a/lily/general-scheme.cc	2017-10-15 17:42:11.000000000 +0100
-+++ b/lily/general-scheme.cc	2018-01-10 16:20:08.129066507 +0000
-@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension
- /*
-   Debugging mem leaks:
- */
-+
-+/*
- LY_DEFINE (ly_protects, "ly:protects",
-            0, 0, 0, (),
-            "Return hash of protected objects.")
-@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects",
-   return programming_error ("ly:protects is not supported in Guile 2.1");
- #endif
- }
-+*/
- 
- LY_DEFINE (ly_gettext, "ly:gettext",
-            1, 0, 0, (SCM original),
-diff -purN a/scm/lily.scm b/scm/lily.scm
---- a/scm/lily.scm	2017-10-15 17:42:11.000000000 +0100
-+++ b/scm/lily.scm	2018-01-10 16:22:54.914457450 +0000
-@@ -836,10 +836,11 @@ messages into errors.")
- 
- (define-public (dump-gc-protects)
-   (set! gc-protect-stat-count (1+ gc-protect-stat-count))
--  (let* ((protects (sort (hash-table->alist (ly:protects))
--                         (lambda (a b)
--                           (< (object-address (car a))
--                              (object-address (car b))))))
-+  (let* (;(protects (sort (hash-table->alist (ly:protects))
-+         ;                (lambda (a b)
-+         ;                  (< (object-address (car a))
-+         ;                     (object-address (car b))))))
-+         (protects '())
-          (out-file-name (string-append
-                          "gcstat-" (number->string gc-protect-stat-count)
-                          ".scm"))
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
deleted file mode 100644
index 8b1f709e6002..000000000000
--- a/media-sound/lilypond/lilypond-2.19.83.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-[[ "${PV}" = "9999" ]] && inherit git-r3
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=x11-libs/pango-1.12.3
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2:12 )
-	!guile2? (
-		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
-	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.19.80-remove-ly-protect.patch
-	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-pkg_setup() {
-	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
-	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
-		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
-			einfo "Updating metapost symlink"
-			eselect mpost update || die
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# respect AR
-	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable guile2)
-		$(use_enable profile profiling)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.21.1.ebuild b/media-sound/lilypond/lilypond-2.21.1.ebuild
index 216a4d458766..ffc80213cf1b 100644
--- a/media-sound/lilypond/lilypond-2.21.1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
@@ -41,7 +41,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
 	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2:12 )
+	guile2? ( >=dev-scheme/guile-2.2:12 )
 	!guile2? (
 		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 		<dev-scheme/guile-2.0:12
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
 	dev-libs/kpathsea
-	media-gfx/fontforge[png]
+	media-gfx/fontforge[png,python]
 	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 6d4c51473a1f..eb38a121f497 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	media-libs/freetype:2
 	>=x11-libs/pango-1.12.3
 	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2:12 )
+	guile2? ( >=dev-scheme/guile-2.2:12 )
 	!guile2? (
 		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 		<dev-scheme/guile-2.0:12
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	app-text/t1utils
 	dev-lang/perl
 	dev-libs/kpathsea
-	media-gfx/fontforge[png]
+	media-gfx/fontforge[png,python]
 	sys-devel/gettext"
 
 # Correct output data for tests isn't bundled with releases
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 6d6590bad2a8..ff877b1e2948 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,6 +1,7 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9cfbf60defe7c3fdcac0f3e943c54dfc38e152df3beb71c5453c7e1df126a3415aa9ea9d75b2abba80efbbf65e64b10388f195c4 SHA512 4d7204b567e578efb3370e11ae69c631c49b01e864c7fb59d6eed309c7ff9ad9d2aa7832ef233f4c5b8e6a26af06c2d9d239cb361d69966e2556cb2816415de2
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
+AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
 DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
-EBUILD linuxsampler-2.1.1.ebuild 1677 BLAKE2B e785675ce4bc7d89a54cf54bebc3b5b95dc5a4d149071faabb3c6931cc1012c3e0f1ac7d6fb47c1918fb26dd4bff614f876f87122f0b2f648415c6856eeb2716 SHA512 e4eca747db52e94147a2baab1c628d2a8370525b462eaa014cb0eab2d71a2c743821fd032b6d3a4ed8c43d8a8fe1effc1428143f6063a2afb3431fbe55b5227e
+EBUILD linuxsampler-2.1.1.ebuild 1729 BLAKE2B 704266c7d7f19307a091b6231f523d661cc892cffcf610aafc7492dd7223a1596e00236b0574be8d358071cc8da0343fd12272fd54226ce6debabfd0e9537416 SHA512 517bd715d58359dfe7ec1edc3fff60f392dcbe67cfe34a64a7b0d62e1c24998883cb7ed74e001f0a4cf06179495e21c80b1ff2aa1f53b937ed63b2df8820f3cc
 EBUILD linuxsampler-9999.ebuild 1577 BLAKE2B e79cae44e8560f0e4790e595d77e34adf9d9c74f2ad99ac20c681a632adc5bb0ee38faf5d2af8c4893322548fb0d2ea4a1b3a25bce439ca766f679b493ff53c0 SHA512 016ac964bfb4eac8d3f32596d684e1e7432eabf53f4f8968ee33eec7a311fdbc71311c4040f1597ecee0a1a3487ec36cc313939c38a22938358fbfa3003cd8da
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/files/linuxsampler-2.1.1-fix-yyterror-not-declared.patch b/media-sound/linuxsampler/files/linuxsampler-2.1.1-fix-yyterror-not-declared.patch
new file mode 100644
index 000000000000..4eb56fddef18
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.1.1-fix-yyterror-not-declared.patch
@@ -0,0 +1,16 @@
+--- linuxsampler-2.1.1/src/network/lscp.y	2020/06/07 15:39:31	3786
++++ linuxsampler-2.1.1/src/network/lscp.y	2020/06/08 11:55:18	3787
+@@ -1479,6 +1479,13 @@
+  */
+ typedef std::set< std::vector<YYTYPE_INT16> > YYStackHistory;
+ 
++/*
++ * YYTERROR macro was removed in Bison 3.6.0, we need it in function below.
++ */
++#ifndef YYTERROR
++# define YYTERROR YYSYMBOL_YYerror
++#endif
++
+ #define DEBUG_BISON_SYNTAX_ERROR_WALKER 0
+ 
+ /**
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
index 3361f3661694..d12a254629bd 100644
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.1.1.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
@@ -35,6 +35,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
 	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+	"${FILESDIR}/${P}-fix-yyterror-not-declared.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 8a8ae197521b..29aba03f3297 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,6 +1,5 @@
-DIST lmms-1.2.0.tar.xz 14541000 BLAKE2B f53206c2a78104d250fd7eda06ea1c646ad40c2db66baa9ed333213900e33bcab5312c95d5864636930be1b798ac1a79754035e3aec3a3772976aefb80dd8191 SHA512 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf
+AUX lmms-1.2.1-add-missing-qpainterpath.patch 1833 BLAKE2B 74ee1bb96bbcdf801e5059bc3c4b067df165e217b6b4b70948dc26df5bde3afb452b9d41e2cedd75941b5c23ca120a739b8f00ef82ad9d05f814d2498e1e49b8 SHA512 1a64bdc01c33f19284ec4f3163bdfd208b40394c11ec767b3954cf0a8f32ddb0dda8014a0e8aa475e22bf75676e4fc3236317fdd76cfd4dd22b7e7bb3963ebae
 DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
-EBUILD lmms-1.2.0.ebuild 2295 BLAKE2B 269a4f054b882c89a79509db4ac38e2304ca75d7d2b46bab628d226a90d37d98a866b14913bc298a2256e1011dff2b3a52e1d3d65be3bdcd1e4255d3b813e4e7 SHA512 f541e9a0747b1f8f5e0c95f833550d2c656d9e2c67c9f4f94fdb820a957e5436efd3b7641d56792870c9ad40a4d5553085203728f410c68523fdffbf96746ced
-EBUILD lmms-1.2.1.ebuild 2295 BLAKE2B 269a4f054b882c89a79509db4ac38e2304ca75d7d2b46bab628d226a90d37d98a866b14913bc298a2256e1011dff2b3a52e1d3d65be3bdcd1e4255d3b813e4e7 SHA512 f541e9a0747b1f8f5e0c95f833550d2c656d9e2c67c9f4f94fdb820a957e5436efd3b7641d56792870c9ad40a4d5553085203728f410c68523fdffbf96746ced
+EBUILD lmms-1.2.1.ebuild 2359 BLAKE2B 90b4d6757ca369e2d4dabd68d3b9d2b51c3d23c346688f172b6dcf8ab8777721622e35c7ab164ca0363710ad83827f0c2edee35b1873bd6516d788726028f60b SHA512 d448dc77290adb24c45606016529c5bff102302ab37f27e4239ce5ace5aab4f78868e921e019ac8a8df44d8b9a79b66e0f6263f12406a12b20e2dedeb19e034b
 EBUILD lmms-9999.ebuild 2288 BLAKE2B 96405ec7db1d97fa503934b6cbc4288a1331b45521c2b1668c2185dc616f323a274883036770140e05f24f87f04486139d9accaaf0bf6f3666047f5d3e2b377f SHA512 e0fb43cc8653aa1a07e3cc1a7950b36c628a6ffa6d31e48ed7e2db7762186e5ebd6276ca70a23460d8d6483f0db4358551c5ad68e431b3f776d61b802bc005bd
 MISC metadata.xml 956 BLAKE2B 9bda57bcbb5b4f6c0831ca465ed48bb27f0c86f8de7908369140b0e7865dc4b44cf0c7b9225bdd8ba786dd4ef22af4a338134e89b23163e0f872519f2e0becfc SHA512 4a3c3bb120894acf50733e003dfdf3132201ad9d9cab21fbde39aca76c38d1e4784d70f2f01c9b889378fc8156271e0e216100dee85d028caef1eaa6dc49a3e0
diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
new file mode 100644
index 000000000000..afade79b0fd8
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
@@ -0,0 +1,61 @@
+From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001
+From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
+Date: Mon, 18 May 2020 18:58:48 +0200
+Subject: [PATCH] Fix Qt 5.15 build issues (#5498)
+
+Add missing QPainterPath includes
+---
+ plugins/Eq/EqSpectrumView.h          | 1 +
+ src/gui/AutomationPatternView.cpp    | 1 +
+ src/gui/LmmsStyle.cpp                | 1 +
+ src/gui/editors/AutomationEditor.cpp | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h
+index cd3f177586..84feeff13e 100644
+--- a/plugins/Eq/EqSpectrumView.h
++++ b/plugins/Eq/EqSpectrumView.h
+@@ -24,6 +24,7 @@
+ #define EQSPECTRUMVIEW_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QWidget>
+ 
+ #include "fft_helpers.h"
+diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
+index 448c233cb4..9889a6b460 100644
+--- a/src/gui/AutomationPatternView.cpp
++++ b/src/gui/AutomationPatternView.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMenu>
+ 
+ #include "AutomationEditor.h"
+diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp
+index e57e29e479..4fe5cb503c 100644
+--- a/src/gui/LmmsStyle.cpp
++++ b/src/gui/LmmsStyle.cpp
+@@ -28,6 +28,7 @@
+ #include <QApplication>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleFactory>
+ #include <QStyleOption>
+ 
+diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
+index 5e8ea8a0af..74f15d358c 100644
+--- a/src/gui/editors/AutomationEditor.cpp
++++ b/src/gui/editors/AutomationEditor.cpp
+@@ -35,6 +35,7 @@
+ #include <QLayout>
+ #include <QMdiArea>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QScrollBar>
+ #include <QStyleOption>
+ #include <QToolTip>
diff --git a/media-sound/lmms/lmms-1.2.0.ebuild b/media-sound/lmms/lmms-1.2.0.ebuild
deleted file mode 100644
index e489666c90fe..000000000000
--- a/media-sound/lmms/lmms-1.2.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# The order is important here! Both, cmake and xdg define src_prepare.
-# We need the one from cmake
-inherit xdg cmake
-
-DESCRIPTION="Cross-platform music production software"
-HOMEPAGE="https://lmms.io"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/libsamplerate-0.1.8
-	>=media-libs/libsndfile-1.0.11
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=x11-libs/fltk-1.3.0_rc3:1
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( virtual/jack )
-	libgig? ( media-libs/libgig )
-	mp3? ( media-sound/lame )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? (
-		media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1
-	)
-	soundio? ( media-libs/libsoundio )
-	stk? ( media-libs/stk )
-	vst? ( virtual/wine )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtx11extras:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/ladspa-cmt
-	media-plugins/calf
-	media-plugins/caps-plugins
-	media-plugins/swh-plugins
-	media-plugins/tap-plugins
-"
-
-DOCS=( README.md doc/AUTHORS )
-
-src_configure() {
-	local mycmakeargs+=(
-		-DUSE_WERROR=FALSE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=FALSE
-		-DWANT_QT5=TRUE
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_GIG=$(usex libgig)
-		-DWANT_MP3LAME=$(usex mp3)
-		-DWANT_OGGVORBIS=$(usex ogg)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_SDL=$(usex sdl)
-		-DWANT_SOUNDIO=$(usex soundio)
-		-DWANT_STK=$(usex stk)
-		-DWANT_VST=$(usex vst)
-		-DWANT_SF2=$(usex fluidsynth)
-	)
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild
index e489666c90fe..2f8eba8d8cdd 100644
--- a/media-sound/lmms/lmms-1.2.1.ebuild
+++ b/media-sound/lmms/lmms-1.2.1.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
@@ -68,6 +68,10 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+PATCHES=(
+	"${FILESDIR}/${P}-add-missing-qpainterpath.patch"
+)
+
 src_configure() {
 	local mycmakeargs+=(
 		-DUSE_WERROR=FALSE
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 5d770344703f..2d770010f3fe 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,4 +1,5 @@
+AUX madplay-0.15.2b-fix-autoconf.patch 3680 BLAKE2B 43f6c7ea82daf816bd6df38f51c808efff962b62edafe8af59cf643632de8ed075ccde4c109368de75df0afa80eec5dd803f36d9ce36d99a519118c4fa0bf48e SHA512 232758235370d5280bd8ca8980edc503d92d0a18edceffff06a2683152b12b9a8fce3a8656284e6d58a91b251978b7a5f88d368452cdf4e9c2bcbbc73514e265
 AUX madplay-macos.patch 593 BLAKE2B 306d4013251f9abf1791c8115f1ccdaf06c706ebae4ec073ff1a6f8f09086c80fc5b3a64d923f9818967f01f2793916ea301b7a078fac5bb879b8d0627180ae4 SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0
 DIST madplay-0.15.2b.tar.gz 590929 BLAKE2B 93a62d04a36247ae8e1f4a63fe183735a2b5a7cd75fcde1ff2261222fad08ec96069b3fe5b7f06ad78a37d5060cff1d233d8139d7d0ff02c5231d2c384fb1a22 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34
-EBUILD madplay-0.15.2b-r1.ebuild 778 BLAKE2B ed4b1ef19681270f56f75587a46a8671bcdba50d14b469ccc29779a8177a00554bbc4b0f2f1f8c655d794869f0b869353bb68d59662f4baaa8138aed85dc0412 SHA512 9a2f67c7339975fefee524a872c9421be73ab7c98d63e1dc86dbf7cb4ad33feb13ec556fd0371497927037b96195ad9787318bd0fffa3e03a3c625e6d4ebc651
+EBUILD madplay-0.15.2b-r1.ebuild 778 BLAKE2B b5b26b0c18879c070d7e6b14caa135b93cda949c1fa635fcb851abdb2a61c69733c0f94f4655e810bbba4729eb52ed21e28193e08e36484216b915723298fb69 SHA512 fcf4d4c7ce5f03129b0316bc912c6885af63f49c9b8a967bcfcb49e8e764cf72db2e940ee6a2cef6cf1c694d2e8afc02d093d64a2b533bfc14773bd1f94d5f01
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch b/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch
new file mode 100644
index 000000000000..92a5a8434e34
--- /dev/null
+++ b/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch
@@ -0,0 +1,182 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,28 +36,8 @@
+ 
+ dnl Checks for programs.
+ 
+-# Work-around for autoconf 2.53 bug
+-case "$host" in
+-    *-apple-darwin*)
+-	: ${CPP="cc -E -traditional-cpp"}
+-	;;
+-esac
+-
+ AC_PROG_CC
+ 
+-if test "$GCC" = yes
+-then
+-    case "$host" in
+-	*-*-mingw*)
+-	    case "$build" in
+-		*-*-cygwin*)
+-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
+-		    LDFLAGS="$LDFLAGS -mno-cygwin"
+-		    ;;
+-	    esac
+-    esac
+-fi
+-
+ dnl Support for libtool.
+ 
+ AC_DISABLE_SHARED
+@@ -67,77 +47,7 @@
+ 
+ dnl Compiler options.
+ 
+-arch=""
+-debug=""
+-optimize=""
+-profile=""
+-
+-set -- $CFLAGS
+-CFLAGS=""
+-
+-if test "$GCC" = yes
+-then
+-    CFLAGS="-Wall"
+-fi
+-
+-while test $# -gt 0
+-do
+-    case "$1" in
+-	-Wall)
+-	    if test "$GCC" = yes
+-	    then
+-		:
+-	    else
+-		CFLAGS="$CFLAGS $1"
+-	    fi
+-	    shift
+-	    ;;
+-	-g)
+-	    debug="-g"
+-	    shift
+-	    ;;
+-	-mno-cygwin)
+-	    shift
+-	    ;;
+-	-m*)
+-	    arch="$arch $1"
+-	    shift
+-	    ;;
+-	-fomit-frame-pointer)
+-	    shift
+-	    ;;
+-	-O*|-f*)
+-	    optimize="$1"
+-	    shift
+-	    ;;
+-	*)
+-	    CFLAGS="$CFLAGS $1"
+-	    shift
+-	    ;;
+-    esac
+-done
+-
+-if test "$GCC" = yes
+-then
+-    if test -z "$arch"
+-    then
+-	case "$host" in
+-	    i386-*)           ;;
+-	    i?86-*)           arch="-march=i486" ;;
+-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
+-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
+-	    powerpc-*)        ;;
+-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
+-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+-	esac
+-    fi
+-
+-    if test -n "$optimize"
+-    then
+-	: #? optimize="$optimize -funroll-loops"
+-	: #? optimize="$optimize -finline-functions"
+-    fi
+-fi
++CFLAGS="${CFLAGS} -Wall"
+ 
+ dnl Internationalization support.
+ 
+@@ -445,71 +355,8 @@
+     depend_audio="$depend_audio audio_$audio.o"
+ fi
+ 
+-dnl madplay options...
+-
+-AC_MSG_CHECKING([whether to enable profiling])
+-AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],
+-			 [generate profiling code]),
+-[
+-    case "$enableval" in
+-	yes) profile="-pg" ;;
+-    esac
+-])
+-AC_MSG_RESULT(${enable_profiling-no})
+-
+-AC_MSG_CHECKING([whether to enable debugging])
+-AC_ARG_ENABLE(debugging, AC_HELP_STRING([--enable-debugging],
+-			 [enable diagnostic debugging support])
+-AC_HELP_STRING([--disable-debugging],
+-			 [do not enable debugging and use more optimization]),
+-[
+-    case "$enableval" in
+-	yes)
+-	    AC_DEFINE(DEBUG, 1,
+-		[Define to enable diagnostic debugging support.])
+-	    optimize=""
+-	    ;;
+-	no)
+-	    if test -n "$profile"
+-	    then
+-    AC_MSG_ERROR([--enable-profiling and --disable-debugging are incompatible])
+-	    fi
+-
+-	    AC_DEFINE(NDEBUG, 1,
+-		[Define to disable debugging assertions.])
+-	    debug=""
+-	    if test "$GCC" = yes
+-	    then
+-		optimize="$optimize -fomit-frame-pointer"
+-	    fi
+-	    ;;
+-    esac
+-])
+-AC_MSG_RESULT(${enable_debugging-default})
+-
+-case "$enable_debugging" in
+-    yes) AC_CHECK_LIB(efence, malloc) ;;
+-esac
+-
+-AC_MSG_CHECKING([whether to enable experimental code])
+-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
+-			    [enable experimental code]),
+-[
+-    case "$enableval" in
+-	yes)
+-	    AC_DEFINE(EXPERIMENTAL, 1, [Define to enable experimental code.])
+-	    ;;
+-    esac
+-])
+-AC_MSG_RESULT(${enable_experimental-no})
+-
+ dnl Create output files.
+ 
+-test -n "$arch"     && CFLAGS="$CFLAGS $arch"
+-test -n "$debug"    && CFLAGS="$CFLAGS $debug"
+-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
+-test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
+-
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+ 	intl/Makefile po/Makefile.in m4/Makefile  \
+ 	madplay.list])
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index c460ef1497d1..8b00f0ac9387 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa debug nls"
+IUSE="alsa nls"
 
 RDEPEND="
 	media-libs/libid3tag:=
@@ -21,7 +21,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-macos.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-macos.patch
+	"${FILESDIR}"/${P}-fix-autoconf.patch
+)
 
 src_prepare() {
 	default
@@ -31,7 +34,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable debug debugging) \
 		$(use_with alsa) \
 		--without-esd
 }
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 3f6d0c142f75..d2d61c26b9e5 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,7 +1,10 @@
 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
+AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
+DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
 EBUILD mixxx-2.2.3-r2.ebuild 3202 BLAKE2B 5e21aa4910d3e136b6123ddb231a7a536db9239b7297d77e929a20bc7ace77de4c8da7809e41c94507b3f663d78a64b0cf4f0fa0717fd3d02539865c1b3fdc96 SHA512 e085cf38879c384701e37cd8ea73e63396a00bbfde371b7eaf326623b09e54078337ba5ead1ad3db1e7c850c2c5353f2262ce277d0b8b9aef29175a8dd356125
+EBUILD mixxx-2.2.4.ebuild 3253 BLAKE2B c691c61b4d483cc60aa6d94e880ba22962fbdc94eba912aa4df1c0fc9b50930ac03b1d161a4d9ad55420066097dca0c85b0e469831c6cb8dfad0a65aac9e7b81 SHA512 af092c60b7453807dd8125d9a16e3fb0e48d5dde5112026ac867a377fc8ed2c5a71243d5ece8e322ad8d4e7c5fe69da75f88fa585c5092ad7a316e978aabe364
 EBUILD mixxx-9999.ebuild 3167 BLAKE2B a043a02cd144dd31758d1dfdbf81f4aff60b1ede13f1e28bb95dac7a392dd9e6307e120cd1924d78a2116996e95a2b03fe24f4fc539da2cd22e609dfc2528f1c SHA512 92daebabad0d42cf176244f2a863f4a32724d8f62b5c6cb8a17a6304231dee27db576dedff3b1f0cb8c0ac5f9d393bd7c61d75f83f052c70500c4202b32c4027
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch b/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
new file mode 100644
index 000000000000..cf1e43654fec
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.4-metadata.patch
@@ -0,0 +1,11 @@
+--- mixxx-release-2.2.4/src/SConscript
++++ mixxx-release-2.2.4/src/SConscript
+@@ -405,7 +405,7 @@
+                 translations = env.Install(os.path.join(unix_share_path, 'mixxx', 'translations'), translation_files)
+                 keyboardmappings = env.Install(os.path.join(unix_share_path, 'mixxx', 'keyboard'), keyboardmappings_files)
+                 dotdesktop = env.Install(os.path.join(unix_share_path, 'applications'), dotdesktop_files)
+-                dotappstream = env.Install(os.path.join(unix_share_path, 'appdata'), dotappstream_files)
++                dotappstream = env.Install(os.path.join(unix_share_path, 'metadata'), dotappstream_files)
+                 docs = env.Install(os.path.join(unix_share_path, 'doc', 'mixxx'), docs_files)
+                 icon = env.Install(os.path.join(unix_share_path, 'pixmaps'), icon_files)
+ 
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
new file mode 100644
index 000000000000..f0d8272d43a6
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 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 lv2 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/qtdbus: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/qtx11extras: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/glu
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	lv2? ( >=media-libs/lilv-0.24.2-r3 )
+	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
+	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
+	"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
+	"${FILESDIR}"/${PN}-2.2.4-metadata.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
+		lilv="$(usex lv2 1 0)"
+		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/mpd/Manifest b/media-sound/mpd/Manifest
index 42273913fb9d..ef27082b4e65 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,12 +1,8 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
-DIST mpd-0.21.20.tar.xz 676396 BLAKE2B e87d844ac0b20f10df7d2306d1c76f76ead84f5e61acb51f60d62847b1fb4f2ada66b20e0a36d87eaf70289027139e4beb80ea8ef7637b1cdb656c9635adb720 SHA512 9dd49190ba4c85014d24e88cdb02a4649e8fb687a49fc9ea019f23725eda483980008e9abebf0ad3960bd310b693c56999699d7c7ddee3ca18e9b2aa6d5a2176
-DIST mpd-0.21.21.tar.xz 676668 BLAKE2B 83964784db4a7372344853ebf2e9c966e23ac293c06304a8aa6f927ec8ea38d2749d88670f1c5e380953bb8b777b4b0f2c5e8a98d7eb3cf1bae50b5e11549150 SHA512 1780a24f341dec1cbc3d9170cc2fc8249081cac8f677ff17df15fc959787cf43d30696eefba9b8a44824da14eee3d58e2ee78b34db1335c0a182b4c2a89e6b3a
 DIST mpd-0.21.22.tar.xz 679244 BLAKE2B d2d76662d1f249b138d3a173cdf712eafcebf91e819b70f2cbc6ccb36ca4bc1f2319972548445789d8861345af5e18ea82f071cd7874a7380bbdda85cf834b73 SHA512 051d97500d8224fe4769a667a58c7915eebcca809e9345a30881f99d7c33d99907d9cc0258c0a5fd20f10609edbeb6da16941099ac3c033762ceb4b116e4df04
-DIST mpd-0.21.23.tar.xz 680060 BLAKE2B 5c7b4a69ff5960b171d715560aa7a6b0712a7fd3758e1561e5aea957c5d13164d92bee0ed262b70ea7e91d73c16412840078603c95d50959cc06d9aa4a981022 SHA512 155f606cd6ddce3e74d745a0f1479776d9f73b4cd250604072a863e28ea72d1ff1a7eafeae44cada7b16042251065634376eaa1a211b503e2f874c72dbcdecf0
-EBUILD mpd-0.21.20.ebuild 7999 BLAKE2B a6df6fef0c69a49ebf6d6f62e28e8e1c4c4fc1b018bb2117662e7d41fe76a7ec802a893694ae1cf11ea7d6d410d42828551a2a61ac7778cf59ffa5813a867fdc SHA512 d2fc65b3e08da812d18c2c80621db7c27fc60b6e5a7e6a00d1de32d6ebe349ea9ab399e904cc9b91c903631d4d4a8d7534495f2d5e05f6a9761d72e93bfd7b20
-EBUILD mpd-0.21.21.ebuild 8001 BLAKE2B 81c39c4402fc11fa7b967431d3c9b6852fbb2e89326da2b266bc0b1213d0d7dfcdca961b82faba100f35ea6bd5556b9fed132a75aaacd3aebd0e55847607c396 SHA512 431ff3b81d538d8215f541947f6c78903849c047c869ada9596f25dde83004097ec9146cabc909f3d154ae9b3239ad39b304033bcbf10d4da162f56a94bed8b9
-EBUILD mpd-0.21.22.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
-EBUILD mpd-0.21.23.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
+DIST mpd-0.21.24.tar.xz 681576 BLAKE2B 4fc46841077a4fd20c9e0f21bc3de09be0bc7d6b4964db33c51f8d79672c2911ab747d08e27d3f9ab65586594f8fd560d044048a826fcae5909e34067bbff592 SHA512 dd0f97cdb405a0995ceafb965d2e872c54b27b384a721efa8d13ae7e28544b22da9e94433bc544f475d8da52d06c020842b11104cbfbc41406a10599db2d005c
+EBUILD mpd-0.21.22.ebuild 7999 BLAKE2B a6df6fef0c69a49ebf6d6f62e28e8e1c4c4fc1b018bb2117662e7d41fe76a7ec802a893694ae1cf11ea7d6d410d42828551a2a61ac7778cf59ffa5813a867fdc SHA512 d2fc65b3e08da812d18c2c80621db7c27fc60b6e5a7e6a00d1de32d6ebe349ea9ab399e904cc9b91c903631d4d4a8d7534495f2d5e05f6a9761d72e93bfd7b20
+EBUILD mpd-0.21.24.ebuild 8001 BLAKE2B 8f111f147671126cd4636d9e94da2b8cafb7a3f4ac6b609ec650b4dc6e04b9035b256b94d024af2e54c60f6be21ef9558cd1ed9d28b69a33c4af7e93dd9a2615 SHA512 185556735c58b8392a1b06f60ec5132acec5887b4a256c621ace4359770aaae8bcfd3a3217d97b78875d64e30d61df431269f4efbb1a7a6604c2e3ac57c203ee
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.21.20.ebuild b/media-sound/mpd/mpd-0.21.20.ebuild
deleted file mode 100644
index 2506310f4d80..000000000000
--- a/media-sound/mpd/mpd-0.21.20.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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 ~ppc ~ppc64 x86 ~x64-macos"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame 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? ( 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/mpd/mpd-0.21.21.ebuild b/media-sound/mpd/mpd-0.21.21.ebuild
deleted file mode 100644
index 3be6a9778270..000000000000
--- a/media-sound/mpd/mpd-0.21.21.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame 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?	( 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/mpd/mpd-0.21.22.ebuild b/media-sound/mpd/mpd-0.21.22.ebuild
index e1d6b01c903b..2506310f4d80 100644
--- a/media-sound/mpd/mpd-0.21.22.ebuild
+++ b/media-sound/mpd/mpd-0.21.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.23.ebuild b/media-sound/mpd/mpd-0.21.24.ebuild
index e1d6b01c903b..e1d6b01c903b 100644
--- a/media-sound/mpd/mpd-0.21.23.ebuild
+++ b/media-sound/mpd/mpd-0.21.24.ebuild
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index a3f4705b3fd1..6f7e606c69c8 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -1,5 +1,7 @@
 AUX mpg321-0.2.12-check-for-lround.patch 670 BLAKE2B e41184968df73dbb3eef1b6149cd569bc40590d5bd1262ede84356ad975498db3533f443aede6afc0c223650cd3e8fd877bceb702c6e645cafef45eb7e273b6d SHA512 391a98bdf102d3016e98005ddc84b6b303e1fd5653ddcaa13cda0b09b84952bee99f3ebbb6ad763a21965c47692a7011e167b7f990cea760ecf88dbaa34de3a2
-AUX mpg321-0.3.2-format-security.patch 1188 BLAKE2B 31ce7e13160c48c53ebb1010a069d0fe6693fab58e12c525dbf3fea6c294bb1f26be703143cd9a3ce10808238017a41f49c8e53ad2029c80d1ad5f346a98690a SHA512 2296934348c898704558f2dac9b7cbd90126d58804df834540688d0c3b35231f488aed036cec200464309cddc2c1adf43759ce87e99d5c370527c552b8e59089
+AUX mpg321-0.3.2-CVE-2019-14247.patch 931 BLAKE2B 5ef376d165a61771241389a9c165be2845dddb0584aad59d1b518ea7e53160d0a3b1f7ec266831220eb1da5082b1c57141ff9f16299a883bd464e1d3395ef560 SHA512 7b14627ae09ed3ccbcb0ecc58ef8f91ef1244fecb1cd3da82f64214fb5237fb4664203f39c92b700abec0e7dd4be78eb863fa3c00313a8a2ebfb0f0c80462108
+AUX mpg321-0.3.2-format-security.patch 1154 BLAKE2B be54674f59b5f98118573828b73942fc7f312e02058e358b3c853318021e30cd5062721c568e83317504770c9f44c052289c32007822a7d99a30df7cef20afc3 SHA512 4184e415f7338d35e2169d663ef24d2d4c0acfc7fac9dc40e184538aaf1c6aaaddd3adce6f54755043dc94b0ee90f74fe287abf6c010f677639dd58b814a4fd1
+AUX mpg321-0.3.2-gcc10.patch 2218 BLAKE2B b78e85d6ec04b6b76471bfe48df31ebd312d97c938f30b823f364dffcfa9101ac2033c4710173902fb42767d664f1bc89e0401b725084a062a35d89a01d14cbd SHA512 079cec28a4ce9aa54a7952e548d24804c266e397b2109eb7cbc42396b88a7f6e4ba5112219d645972d293e90ba12e5f696d606c803cff9225888cac1ba0cea79
 DIST mpg321-0.3.2.tar.gz 151139 BLAKE2B d1b043316aca07e61ab61698f1d9e56fd221c4024e69b5262906b280dcb4f67bd32f3ff72b1758ba26cc0fa7d1c5c4052fc6fc87ae9ceec9d0bf77b1d35a868f SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
-EBUILD mpg321-0.3.2.ebuild 1178 BLAKE2B 62c2113d9085a05ead8a85749bcbce1f69c3e6ab8180f59c331a8ac0c63a295cf2e16a02275b274f22da6d3e1576c7a85c0b9f70818d3338f2e3a965f54e284f SHA512 9a2627399596fbf341e340361eb670b7757b49d2d1e3c7b1ace0a89acf112d857886042f0facd9e8d6cafd6c6fdd1e2e876da73fd66584ca051bd815c253ac23
+EBUILD mpg321-0.3.2.ebuild 1263 BLAKE2B 7638dc346137e269e038217499a25538151a63b6a71639fe762bed5af19ddd71f6801ff7f95ef8c50d36afa4b74b6554a30b9ebc916b4cdd7aacd78d005b2ddf SHA512 08aad7e63cd5e125843e619c70c1902c16feba7453cee8bf9a9371f63690b70ec2d983d6f7792b7e4f95e858923fa015889772b9db8919ee2b0924ca3d0849f8
 MISC metadata.xml 329 BLAKE2B d54fd85110b067a080ba1be242f8ee2e5c76b503e7fd6852fba8b1af20873244666fe5d46a1cbdce2a555c44dd057e99801f7974ceac78076c0189976c125960 SHA512 7f66ba87cde258577f41f82b9056b613d1da1741a3dbefe2185562549cf53050d5073b24f07f2b7de25f06b55cdde55653cb8de03d97806a2c47224b8e100764
diff --git a/media-sound/mpg321/files/mpg321-0.3.2-CVE-2019-14247.patch b/media-sound/mpg321/files/mpg321-0.3.2-CVE-2019-14247.patch
new file mode 100644
index 000000000000..ff8aea8f8e7d
--- /dev/null
+++ b/media-sound/mpg321/files/mpg321-0.3.2-CVE-2019-14247.patch
@@ -0,0 +1,20 @@
+Description: Handle illegal bitrate value
+Author: Chrysostomos Nanakos <cnanakos@debian.org>
+Bug-Debian: https://bugs.debian.org/870406
+Bug-Debian: https://bugs.debian.org/887057
+
+--- mpg321-0.3.2.orig/mad.c
++++ mpg321-0.3.2/mad.c
+@@ -574,6 +574,12 @@ void scan(void const *ptr, ssize_t len,
+ 
+     if (!is_vbr)
+     {
++	if (header.bitrate <= 0)                                                
++        {                                                                       
++            fprintf(stderr, "Illegal bit allocation value\n");                                                                              
++            return;                                                             
++        }    
++
+         double time = (len * 8.0) / (header.bitrate); /* time in seconds */
+         double timefrac = (double)time - ((long)(time));
+         long nsamples = 32 * MAD_NSBSAMPLES(&header); /* samples per frame */
diff --git a/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch b/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch
index 732ca2c60225..c93d8d796dc8 100644
--- a/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch
+++ b/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch
@@ -1,5 +1,5 @@
---- /var/tmp/portage/media-sound/mpg321-0.3.2/work/mpg321-0.3.2-orig/mpg321.c	2012-03-25 14:27:49.000000000 +0200
-+++ /tmp/mpg321.c	2015-08-12 23:34:20.395331151 +0200
+--- mpg321-0.3.2-orig/mpg321.c	2012-03-25 14:27:49.000000000 +0200
++++ mpg321-0.3.2-orig/mpg321.c	2015-08-12 23:34:20.395331151 +0200
 @@ -183,7 +183,7 @@
  				else{
  #endif					
diff --git a/media-sound/mpg321/files/mpg321-0.3.2-gcc10.patch b/media-sound/mpg321/files/mpg321-0.3.2-gcc10.patch
new file mode 100644
index 000000000000..8966d9f7c8d0
--- /dev/null
+++ b/media-sound/mpg321/files/mpg321-0.3.2-gcc10.patch
@@ -0,0 +1,83 @@
+From f930c3b81bdf9c05152fb005562b3869f6e36f34 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 4 Jun 2020 20:41:25 +0300
+Subject: [PATCH] Fix GCC10 compilation
+
+---
+ mpg321.c |  8 ++++++++
+ mpg321.h | 16 ++++++++--------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/mpg321.c b/mpg321.c
+index 19282bb..663882e 100644
+--- a/mpg321.c
++++ b/mpg321.c
+@@ -63,6 +63,14 @@
+ #include <pthread.h>
+ #include <semaphore.h>
+ 
++output_frame *Output_Queue;
++decoded_frames *Decoded_Frames;
++int semarray;
++int mad_decoder_position;
++int output_buffer_position;
++double real[FFT_BUFFER_SIZE];
++double imag[FFT_BUFFER_SIZE];
++int loop_remaining;
+ 
+ int pflag = 0;
+ int volume = 0;
+diff --git a/mpg321.h b/mpg321.h
+index 798bff0..235cf4a 100644
+--- a/mpg321.h
++++ b/mpg321.h
+@@ -116,7 +116,7 @@ extern char *playlist_file;
+ extern int quit_now;
+ extern char remote_input_buf[PATH_MAX + 5];
+ extern int file_change;
+-int loop_remaining;
++extern int loop_remaining;
+ 
+ extern int status;
+ extern int scrobbler_time;
+@@ -233,8 +233,8 @@ RETSIGTYPE handle_sigchld(int sig);
+ #define FFT_BUFFER_SIZE_LOG 9
+ #define FFT_BUFFER_SIZE (1 << FFT_BUFFER_SIZE_LOG) /* 512 */
+ /*Temporary data stores to perform FFT in */
+-double real[FFT_BUFFER_SIZE];
+-double imag[FFT_BUFFER_SIZE];
++extern double real[FFT_BUFFER_SIZE];
++extern double imag[FFT_BUFFER_SIZE];
+ 
+ typedef struct {
+ 	double real[FFT_BUFFER_SIZE];
+@@ -258,10 +258,10 @@ fft_state *fft_init(void);
+ /* Output buffer process */
+ void frame_buffer_p();
+ /* Semaphore array */
+-int semarray;
++extern int semarray;
+ /* Input/Output buffer position */
+-int mad_decoder_position;
+-int output_buffer_position;
++extern int mad_decoder_position;
++extern int output_buffer_position;
+ /* Output Frame including needed information */
+ typedef struct {
+ 	unsigned char data[4*1152];
+@@ -285,10 +285,10 @@ typedef struct {
+ } decoded_frames;
+ 
+ /* Output frame queue pointer */
+-output_frame *Output_Queue;
++extern output_frame *Output_Queue;
+ 
+ /* Shared total decoded frames */
+-decoded_frames *Decoded_Frames;
++extern decoded_frames *Decoded_Frames;
+ 
+ #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+ /* */
+-- 
+2.26.2
+
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index 1c6cf71665a0..390abffdec04 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit autotools eutils
 
 DESCRIPTION="A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
@@ -23,9 +23,15 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}-orig
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.12-check-for-lround.patch"
+	"${FILESDIR}/${P}-format-security.patch"
+	"${FILESDIR}/${P}-CVE-2019-14247.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.12-check-for-lround.patch \
-		"${FILESDIR}"/${P}-format-security.patch
+	default
 	eautoreconf
 }
 
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 178eb7f664ec..7abb05debdbd 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,7 @@
+AUX mumble-1.3.1_rc1-qt-5.15.patch 937 BLAKE2B 1afb11851d3645a805190ab1094c054fb11e4de742f2ddf0b93e918d2cf75f192691d42b51be686714b0c5d4b61d000921ffb011f1dc58fdff8273dc427ac5a9 SHA512 e634e9736b21fcf4f652221428f8426476e229871c5da690ccac51f4b261bfad3d52ce313b96ce6bd82dc31b4d1197ec0099796bb747a8f6047c21249710fa12
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
 EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
-EBUILD mumble-1.3.1_rc1.ebuild 3786 BLAKE2B 2ec4700d67e5c7f33687147b3771b47d8cdae0279122d2fcfd003b8fec29227ce9c9c56e00344af332d9758474b7c53a1d97971af179c1b905dcf0fed6d97d64 SHA512 2d59f8fe221997fc0f1bd5157f2a5eb55f4e4de5ee2bc33510ee39cfb69a0a42b35e507142cb2fff0c5e429606fd190264a6bd2a218201be7a934b1d5faf2978
+EBUILD mumble-1.3.1_rc1.ebuild 3861 BLAKE2B 2214f7db3b1d97a9c64dbc869c20e964db9185343b417223e287debefdacb4d130bcc73228494daf8fa5ec82e61e566430d6ce5cbc0a0e1dfdd9843ef19eda16 SHA512 9c1641d264db4eddbd48d9565f5bdf5b973f2b0db6c83f069291a7adbdcfe534eea4b8518411fbc972cc00689d3e8b775c982a89a36f1829e3da013e953d69af
 EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
new file mode 100644
index 000000000000..4268d56e8290
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
@@ -0,0 +1,28 @@
+From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001
+From: Marco Genasci <fedeliallalinea@gmail.com>
+Date: Mon, 1 Jun 2020 21:01:00 +0200
+Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath>
+ include for Qt 5.15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’
+   42 |   QPainterPath qpp;
+      |                ^~~
+---
+ src/mumble/OverlayText.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
+index f06f2b63a8..c1cd9efdd7 100644
+--- a/src/mumble/OverlayText.h
++++ b/src/mumble/OverlayText.h
+@@ -6,6 +6,7 @@
+ #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
+ #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
+ 
++#include <QtGui/QPainterPath>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QFont>
+ 
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
index 69f5d7055e0d..f23f44786ac9 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1_rc1.ebuild
@@ -64,6 +64,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692
+
 # NB: qmake does not support multilib but it's fine to configure
 # for the native ABI here
 src_configure() {
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index f49b39369605..a07e51accc83 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,4 +1,5 @@
+AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0
 AUX musepack-tools-465-gentoo.patch 1558 BLAKE2B 292111fc2b795a98cc2c1926b63799114e4b6ea2c11aa9ddee78c24332181ac9d5c4ab403398470014b5f33cf246def98214026d0def5979e11df2a1e2747050 SHA512 c260e1f96fa4ab79f09d78f16ede4522a802f703d565cf6db974b918e8db48233211a561ce64e0e8bc7cbd177ebf2986c46e5c9811ac15515f8126458c15b0af
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 829 BLAKE2B 61f1e89fa5870e49602654f33a68d8ce5e19898b65e085657a7342af5ada3d81a2f3ef0d9a931d70641409b2c79546331d9792090d494b8831ec8887a0a391dd SHA512 ed3e8411ecaf544be2ec7be4d7ee5efed06612244c24f0c1004f1c6a82904ed3ca63f054d6341f9b6a974fde09d5231f7f219c5a8c15692f265747d434870516
+EBUILD musepack-tools-465-r1.ebuild 867 BLAKE2B 3e2e6ef1d0059aeb0f184fccbc750bc684a6cb4687a7fd2b48363f7a9979b89f5bb2e1455e31fa05a0ff1dcd64b97d820b0170592b438853999b908d12e97b45 SHA512 63540e27bd3deabc966c14a2c3bc5a726e2844602a38abfc8310a9b83862873198f8650212dfff51c4f9de317ea49616346c1d6999a9c90738bd56cd1fd6515e
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch
new file mode 100644
index 000000000000..0fb9f5e5eb55
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/706992
+--- a/libmpcdec/requant.h
++++ b/libmpcdec/requant.h
+@@ -47,9 +47,9 @@
+ 
+ 
+ /* C O N S T A N T S */
+-const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
+-const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
+-const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
++extern const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
++extern const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
++extern const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
+ 
+ #define Cc (__Cc + 1)
+ #define Dc (__Dc + 1)
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index dd79c74addd3..6c28404bd48e 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -27,4 +27,7 @@ RDEPEND="${DEPEND}
 	!media-libs/libmpcdecsv7
 "
 
-PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
+)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index d3207043a51c..f3a1f44a9fd4 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,5 @@
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
-AUX musescore-9999-lambda-capture-this.patch 566 BLAKE2B e07244640ca103698d877c839a89a04b63953c99b5c5d2d809a378a155a9dafece85ddeb2bd8c31b42bdf66be3b7da06ed9e8d263258122ecab2ac32e496b3ea SHA512 2abcddcf39a327ba1a62cddc3f10fe713c8031dc03657ead73161ed1f0050d3ed12a95b3d1a1df6e6d7f604f079f0cc41ec39c2dda5e94b29485f5d8dbafa990
+AUX musescore-9999-lambda-capture-this.patch 549 BLAKE2B 2aaf1ffb0383bce4f862d6172c3e0eb2fdd756a03b2345df9f8b1ea08f30d3ef29ea89c16f56268d0116e2e65c73b974f891ddef55da3816c2d1a94f234babc0 SHA512 bcf4ed087bca2ac9771dceaf0506d0870bcc1ebc2a233157550ad2bce209a2d24c6dbb36d7474f483ba4e2959b54bc7b368878c038dc79dfd50eab0c70f69eb1
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
 EBUILD musescore-3.4.2.ebuild 2687 BLAKE2B 9a8286431e2694bb88c0d91a7d761244049087cadf09562210539c9ddb80b7a6a8982d0db2bcfd1d9ebed5a98ff726481773b4cb3694fd80e2fd78397198a80f SHA512 e6bb0486a2de0d0c293c5c1afe730a09ed2b6676b1e038f811b6d0bdcda1712d2a68cf4dce8dbd5e7f38457270b35fa0d410a993f48247b19c86fdb1d7acfb87
diff --git a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
index c0bb7083324d..24c33bd2f184 100644
--- a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
+++ b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
@@ -1,13 +1,13 @@
 diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 9804e1f32..83e0c0e47 100644
+index f3fe9ce8b..3957f90c6 100644
 --- a/mscore/scoreview.cpp
 +++ b/mscore/scoreview.cpp
-@@ -2405,7 +2405,7 @@ void ScoreView::cmd(const char* s)
-                   cv->updateGrips();
-                   }},
+@@ -2649,7 +2649,7 @@ void ScoreView::cmd(const char* s)
+                 cv->updateGrips();
+             } },
        #ifdef OMR
--            {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+            {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
-                   if (cv->score()->masterScore()->omr())
-                         showOmr(!_score->masterScore()->showOmr());
-                   }},
+-        { { "show-omr" }, [](ScoreView* cv, const QByteArray&) {
++        { { "show-omr" }, [&](ScoreView* cv, const QByteArray&) {
+                 if (cv->score()->masterScore()->omr()) {
+                     showOmr(!_score->masterScore()->showOmr());
+                 }
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
index eb982ba62058..b8992c8de6ff 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 1004 BLAKE2B 054a7d68036433332dc55b156885a200f67366046f4fb9ea21d534b3bbc4bd9653fcd978650bc704e79dfb8d1fe37e64a1b50df4c7888e8c78fd4ce183b53ccd SHA512 b21bb68ad00b536fc2805fe675dc2ef5dbb604b164c960d69b8db75c051108b896796ca3392cb92f56242a254f0241a3e035613188fbe2377966da8394cb32ac
+EBUILD musique-1.5-r1.ebuild 953 BLAKE2B 58aee0f9a8778f11f941953a1f9fd3ae76379ecd5519fd8ee09f1c50fd3e1765d74ca9fb3e88ae6abac97644066e6eb4fa137c834d6a2b29b2729e2ab46aaeed SHA512 0e8b2f43cc6b1d13927ce7a967602682454c69e1cd711d0da7293590406a719e3bd5eff4f2f1cfb193b8942fc2cf1a025cc1d0d031276ce5c2d2b16b979d00f1
 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 9e7f3e33e4cf..1763328bfb02 100644
--- a/media-sound/musique/musique-1.5-r1.ebuild
+++ b/media-sound/musique/musique-1.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
 DESCRIPTION="Qt music player"
 HOMEPAGE="https://flavio.tordini.org/musique"
@@ -28,6 +28,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES TODO )
+
 PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
 
 src_prepare() {
@@ -44,14 +45,10 @@ src_install() {
 	einstalldocs
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 5bdd4b8936f1..099a2efd979a 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a
-EBUILD openmpt123-0.4.12.ebuild 1722 BLAKE2B 40fc9e664030922463ecb3a899ff83e5f4a338ca698e6c191ccbbd81cbc956aaada491052ae57364b3d0b04d772be8937c13ccee57b753843049ce8f4d59b289 SHA512 7e128e38f365cb8077bfe6ce661b59839e2ddfd69312d95dae8a0a8006e930bb7dcce9e263372484d7b6cd5031aab635b19c4e71bc401a3d3c4ecfc1de16a8b3
+DIST libopenmpt-0.5.0+release.autotools.tar.gz 1463179 BLAKE2B 666862b67cd5c57877af0bde71960894ac109e57bb53bc0aac953b769823e73e4ac78766d6c8d1f039decc9df271d48ebb0e941913b198e27e6285d264c41825 SHA512 1b62e67deb1541eeeba91b87c393b0bb8a5412e2f4718bad341f14167238bbea0084de9a7c20e5bdd9621ecf5ed78b08924b41526c7148435c0ee5ba31ca9d82
+EBUILD openmpt123-0.5.0.ebuild 1712 BLAKE2B 5b8bb32084d73e031546eefbe4089acfb73a1cc65a1386061367e9aa3dd00bbe6af7418b7396582e3ba901e11472dc0f3bd92d4918b5180e9ca0b468e5aeea56 SHA512 3a063ea27298a6bd564a9db574754efa0470c9ece0c6094060fbb945a0567725ba7028143a28e138eecd5169aee627df3ceb03be132368e34d40c74072571c98
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.4.12.ebuild b/media-sound/openmpt123/openmpt123-0.5.0.ebuild
index f015fab023a7..e80baefa2b25 100644
--- a/media-sound/openmpt123/openmpt123-0.4.12.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.0.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	~media-libs/libopenmpt-${PV}
 	flac? ( media-libs/flac )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )
+	sdl? ( >=media-libs/libsdl2-2.0.4 )
 	sndfile? ( media-libs/libsndfile )
 "
 
@@ -60,7 +60,6 @@ src_configure() {
 		$(use_with portaudio) \
 		--without-portaudiocpp \
 		$(use_with sdl sdl2) \
-		--without-sdl \
 		$(use_with sndfile) \
 		$(use_with flac)
 }
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index faf2a258a90f..f240871b6f83 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,8 +1,7 @@
 AUX patchage-0.5.0-desktop.patch 224 BLAKE2B 74bae167f890e5c03043f8906a18576183d2519141d5413780e03091c9b5432044185812d192c12073eadaab0823e8ef1d25c81d57e8614abd120440763d6776 SHA512 ae000bc340d48a9bb89fc067b4b1abba3de39ef9be086c7eeffae71ddca6172ce500ea6ea9854fde8cc19df3117195cb6fdb4ecd0867aa69f332ac0a7d377b69
 DIST patchage-0.5.0.tar.bz2 411848 BLAKE2B 50138309d31c4806072c95af7df46e1b0ca2fe570c606886d9d6eb666cb3a499c12689b3ba1db26c0d59dd0ee732e350a6dffcdb7bee98f78906fa957e1e2609 SHA512 2b6c971f5fb192309734d6f42f17db83979805e6dcafbc95b343c3749afd85ea65c9b7d101b0b4bdf5102b6d60394cabcaa0d511aeb3fe1bf2db924b7e8b46cf
-DIST patchage-1.0.0.tar.bz2 414300 BLAKE2B 4f2fd0a0911cb261508883b73305c2736143d9a165b854b8b4042a3c0f6454e1f79bc3b6cd5d28844e1cdeeaf7dd20effc164aa1151390d4c45af0a339c2ef5a SHA512 0a2be0183257a34a68ec84e6fb17d29a3d8ba7dd54a05fcdd13784ac8f5621eb7a376f17d42168958f5e1a8dab8858a9c5c8c867aa1838736cc2b7775f75f510
+DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12
 EBUILD patchage-0.5.0-r1.ebuild 1053 BLAKE2B f9325dd2613b625b24a3148c4e3564649be2c54ee8659fef6855fbe2f71a10689ef45b5ae71507052721d94d10305fb0e947d720103a7e775cb9be1366b6e582 SHA512 152269c91e8f51b549ac602ebbd01452789531b28912ee2510fd85950760f40605fe6c4549dbb3261203c493bdb87bc4f0750d8fd9a632608d659aee2ab702cb
 EBUILD patchage-0.5.0-r2.ebuild 1142 BLAKE2B 70b44df31cbd9a2d8a6f883f2daf296547a7ce0eebcc4e0d88b15c2ba933d0a4722812a162aca12fbb6c182609097e4705aed95df951f7c50238ef053fbb2197 SHA512 7ed8905edf25c21bda792405bf6a404deb21074537171b8d432d6ed79557d3ff2ad906f78a19a1085df1ac991ec24de644b4c74056e9d47a56359eb06a5667dc
-EBUILD patchage-1.0.0-r1.ebuild 1122 BLAKE2B de6eb728edca3aa060e87d88624d7a9d706ba1d5ddd51f8b473d705da02784533840fd9f81a8153d660400ede53a737813bb205916233c2c588218e7b70640c2 SHA512 49a4a9dec4509364bf98706d1283278e7cb2313c5d3074f5da6c54a30c76fd825bc1e078affaeeaf5623bea20e824d6abfe6e5d55e516b700203feaa7229a9be
-EBUILD patchage-1.0.0.ebuild 1019 BLAKE2B 3774d94ab2b5008c68c677b678775237ce3133bb0aa5eb0a85bc3ae7daab2b6aad9f2acbe2e2ab211b886446debec098fd78dbd6a1697f5ff66aabaa59b52d3a SHA512 86792e91be4163bc9c00ed0847f71db08e3e5de320c12823d9e2a09a53c58786f126a4533974d5ac93bf97e0426469301b478c6dab465271e1255cc4676e17a2
+EBUILD patchage-1.0.2.ebuild 1027 BLAKE2B 30761c26b59787bdd5dbbd8386c5eebb98ca4b8fdfeee35f4f7aba9d150a47f36b825bc98f978a7c61acbe6cbd403a564a59cc3bb049e8f362cd34fce4e85a0c SHA512 63fd8c3694cefeb8265e74b5806c3ee2f99274bea21c311b16a88d39cb824e355b85bc66196d2d9c6e6ce6dc0baf31b04b4347bf773f6a309ce8e477df4e12bc
 MISC metadata.xml 600 BLAKE2B 89bfd8b0da00e90fdd9fb85ca8604c80de0e2a8e471309aec0022f31f844d06c914c7536a3928179256f85b313fefaa3dec8937159f7131a03838276cca86162 SHA512 d08bd05a57ca03d9f91c0904f9a1b92e332e4475fd6729feefb63c75df2c5ad6eebd718b6e7db8482819f463606dcca888400c1560dd9b2c9e426c26634ece77
diff --git a/media-sound/patchage/patchage-1.0.0-r1.ebuild b/media-sound/patchage/patchage-1.0.0-r1.ebuild
deleted file mode 100644
index 6fe9924872d5..000000000000
--- a/media-sound/patchage/patchage-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit gnome2-utils waf-utils python-any-r1
-
-DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack-dbus session"
-
-RDEPEND=">=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.11.12:2.4
-	>=dev-cpp/libglademm-2.6.0:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	>=media-libs/ganv-1.4.0
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	jack-dbus? ( dev-libs/dbus-glib
-		sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use alsa || echo "--no-alsa") \
-		$(use jack-dbus && echo "--jack-dbus") \
-		$(use session && echo "--jack-session-manage")
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/patchage/patchage-1.0.0.ebuild b/media-sound/patchage/patchage-1.0.2.ebuild
index f8d6244f24dd..d936e4293435 100644
--- a/media-sound/patchage/patchage-1.0.0.ebuild
+++ b/media-sound/patchage/patchage-1.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE='threads(+)'
-inherit waf-utils python-any-r1
+inherit waf-utils python-any-r1 xdg
 
 DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
 HOMEPAGE="http://drobilla.net/software/patchage"
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	dev-libs/boost
 	virtual/pkgconfig"
 
-DOCS=( AUTHORS NEWS README )
+DOCS=( AUTHORS NEWS README.md )
 
 src_configure() {
 	waf-utils_src_configure \
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 2077990009c5..e9b52afe223e 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -3,6 +3,6 @@ DIST pianobar-2019.02.14.tar.bz2 48396 BLAKE2B 3b25cdbd086efdb4c5f3239b9c47af6c6
 DIST pianobar-2020.04.05.tar.bz2 48823 BLAKE2B 91e9b96f0a635995ab08bd189b7b6b353f553b6c6cd405be2e95f9c0401b075158df4aa28633854747eced4ac60777724dd265dae62744c773d5f4b4c12aa90e SHA512 40d717693f128da3718c0e1be9c90c269712becf9ac2ffe0669a91ea9417d0fdb0476949df29c1da908e2d78678f26955149dbb8c5a0167161f95835ce76084e
 EBUILD pianobar-2019.01.25.ebuild 1015 BLAKE2B 63d7be43743ef0758239c939c03ccb4ac4b3adcec06515bd34e55e62f0372a4de8d6090685b32130fd7d2a454a5380fa8c69b5ac33eb8c5eb1b809972dba79a7 SHA512 02705089829c265c0da59411f8490fcd5ba9a263173c28df2f7947d9111ed49484d551a28b160ddcd7ba7d5fbc9f23d6771453bc5a19236726c0b081f0da92f0
 EBUILD pianobar-2019.02.14.ebuild 1017 BLAKE2B 7441a958a2593150d5e456582dfe96afec1ec542d7311e671bdaf0911fa5798ece36f8fa77552f5fd07cdff384f9c29348ccbeee2cbc05d2f1293501f47b43fd SHA512 298018f09620bbbe022371f41cbd5d47056efbee0583b65c8dc3391543270ef7934cd43be18d3af14c5407465fcb777c8ce9e755cc9d37cde7d5496188884033
-EBUILD pianobar-2020.04.05.ebuild 994 BLAKE2B 7400dfe4d9fbfee279444fd1e15fe7d3b6bbad645a1f4e7f4e7d2784933e0716e7b1122f661d85faf5758ef4695aaaaa0e0f79b5cefd6fe670f8ae25be0e80fa SHA512 dd60983120ee159d536caa06c1e1019b81220e05f616925e43ef6e3e5154b12eb2df85881be47583f7677a26f04f22888ecdeca0e48a019dd2790286b3f610f0
+EBUILD pianobar-2020.04.05.ebuild 992 BLAKE2B 16aaba26aa09d2ebeff2544644f34e85c6bd1bb2e2ad3a9e4695d5c2c20dadef1dfb88455491be301c21339d191e090d7bbce73d5b9b70d3b61db1467360e5fa SHA512 39a998c14439899b6d3c9856d6f6f4af593c3a3add50b5ff2c55b9fc57f20937e2009e52fc756141772a0cfac2c35ffb1f60af09cda81a628399b57803b4030c
 EBUILD pianobar-9999.ebuild 994 BLAKE2B 7400dfe4d9fbfee279444fd1e15fe7d3b6bbad645a1f4e7f4e7d2784933e0716e7b1122f661d85faf5758ef4695aaaaa0e0f79b5cefd6fe670f8ae25be0e80fa SHA512 dd60983120ee159d536caa06c1e1019b81220e05f616925e43ef6e3e5154b12eb2df85881be47583f7677a26f04f22888ecdeca0e48a019dd2790286b3f610f0
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2020.04.05.ebuild b/media-sound/pianobar/pianobar-2020.04.05.ebuild
index a13e7069ac50..7385bc04331c 100644
--- a/media-sound/pianobar/pianobar-2020.04.05.ebuild
+++ b/media-sound/pianobar/pianobar-2020.04.05.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
 else
 	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 1be30d365307..9947faab79e3 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,3 +1,5 @@
 DIST pulseaudio-ctl-1.66.tar.gz 6633 BLAKE2B ec197571563f8503a0b35a4a3269984e8f53ae0df9a2bcc6a8dcf9a88df8d927634a5c8570a4bb69cc0d36289adfe73ac5b7f2d904790476be83fad3b93e2b05 SHA512 cadcb09781cf370e5280c1fa20bc9d10cc8e8162859a53f0b3cf3d94a50267638f9a454716c07cb4d300de9a3cb1bf6e6950763c2d97a48ba6cb5ac8ec72e8f7
+DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
 EBUILD pulseaudio-ctl-1.66.ebuild 683 BLAKE2B 3b29bd3f83c06a94fcee3432bd31960d45bbdfa09e8947bf71ab0e5e4836667ef0a0dea8d897176fe0dd04d537f26e2c1dc893cfa053bd23bccec2350949cdcc SHA512 63d4e67f2acac1baf8eb2f94377cc09b3715e54459cf035444552da5c52f3c171c632110c653295b103205e672c9729ac2ce05f96baaab524925342b5f3edabe
+EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
new file mode 100644
index 000000000000..ad9ef3abe659
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CLI utility to control PulseAudio volume"
+HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
+SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
+# in both cases they should be already present if DE supports them
+RDEPEND="media-sound/pulseaudio"
+
+src_install() {
+	# install-man target compresses manpage
+	emake install-bin PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
+	doman doc/pulseaudio-ctl.1
+}
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index e8b5a03f6674..29b54336ad7c 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,5 +1,7 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
+DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
 EBUILD pulseaudio-modules-bt-1.3-r2.ebuild 2228 BLAKE2B 8c21f34108dfcc888e92784ea0d8e648214b1ba3abf78265e9ed501d03fcdb473a0543c5c93c02028e5d00c36b654e237fc9ce5d362b13f1933e2ef6f25802a3 SHA512 65166145c85b9337d75e3b1cb1ea75cd68945aa0859d092a6373b9dd610de641ecfe92abd9182949e11f8d4027b0487458e85f91178b76c47c81e6df890df411
-EBUILD pulseaudio-modules-bt-9999.ebuild 2097 BLAKE2B 4a441e062fbb3dadc239f9e258e7882cd2650a86ca893b9ea54e10f4ac5926ad15ad113ca712e950710d352691c9fd0cf92356ed539a64b8ab9945391ce4afea SHA512 3fb96278f148298f3c959b7d80c7e5436a8466931f66850efa7ee2d23c4e7b0db3b3a6706fa4c1f652354c56671026fa9d79cd8cb8261c1dcfe61d6410befe3a
+EBUILD pulseaudio-modules-bt-1.4.ebuild 2194 BLAKE2B 389cd211299f30b3fa4634bcdec0eb6f1b7152bede7558bcd516b1a80d05a8cdebddfc0904cfffd233eccae54292bf75d5a85ddc7ba335c87bdd1f932390e32f SHA512 a34e4f1956670b72b80712c49dfab5325cb916594e71a9f7c4fc0eedbe8a318a427f12947a771ed83ec065dbbd1deb69b49e366ead93c5f3e817de92e564e550
+EBUILD pulseaudio-modules-bt-9999.ebuild 2063 BLAKE2B b45bfc09796b5c9614ec159ab0f79481009b850aecfe840c94789ac32fd8eac21e9143e2959bfbe1f6e099cf106e4edbbc2dac1f8137ff80d6dbbfc016f8b8fb SHA512 1003a535a6a01464f85ca06cfe9eb20519ed78e0855bc86afc16634f4e3582976738b4d333bf41efcfacde7c8733b363f8cd42dd314468dfa7a0f9ac9cf2c993
 MISC metadata.xml 766 BLAKE2B 3fc16e24b2ecb5212c32ada629f2e8c19c91921333db4de169f0848b6bc63b2001c8e68d7c82765e064f8ecbed10e25bc926ea7c598c09d88d5e474df63ab9bb SHA512 c14a460ddba2b09ecddd6a5f12ca8a888b22bac2b9f606249d466473bde3e6ae5c64ee899e74c5ca10c3708d9a39874dfcbbce84c3ccc383c274ac8cfbde43bc
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
new file mode 100644
index 000000000000..56a66ff8e9e3
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
+HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
+
+PULSE_VER="13.0"
+SRC_URI="
+	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
+
+DEPEND="
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( media-video/ffmpeg )
+	media-libs/sbc
+	ldac? ( media-libs/libldac )
+	>=net-wireless/bluez-5
+	>=sys-apps/dbus-1.0.0
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
+"
+# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+DISABLE_AUTOFORMATTING="no"
+DOC_CONTENTS="
+After getting media-sound/pulseaudio merged without its bluetooth
+support (to not collide with this) you may have removed the loading
+of bluetooth modules in default.pa config file, leading to failure
+to use your bluetooth device (see
+https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
+Please ensure you have this lines present in your /etc/pulse/default.pa
+file:
+
+.ifexists module-bluetooth-policy.so
+load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+load-module module-bluetooth-discover
+.endif
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake-utils_src_configure
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# pulseaudio headers needed to build
+	rmdir pa/ || die
+	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
index 4847cdac7273..5363d6d475a6 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -34,8 +34,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-CMAKE_MAKEFILE_GENERATOR="emake"
-
 DISABLE_AUTOFORMATTING="no"
 DOC_CONTENTS="
 After getting media-sound/pulseaudio merged without its bluetooth
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
index 01b4a16e706b..3d60dbd8a6df 100644
--- a/media-sound/qastools/Manifest
+++ b/media-sound/qastools/Manifest
@@ -1,3 +1,7 @@
+AUX qastools-0.22.0-nomancompress.patch 4667 BLAKE2B e9d11e1aeae8eba81ca60dbfb37da0c5e8efcc30d62899806b9415898a2484ed833caa42dfab2f5532f551486f3ce592e260c9b8396289d27eb488be00a06344 SHA512 ee10a90d8c92eeb124bef8ae6edc023cf452585679380c4e7cb406ed41cd4d04db3b8075f89c2925d2d020fc9a0d035d8e3762e2af92085418e5eb94064c604c
+AUX qastools-0.22.0-qt-5.15.patch 2047 BLAKE2B 01a473dce7c070b47e611ea7f05d1a16b07a6c7c692f8a98bde7dd12b286cdea04fe79fdf62ab99e1b5cd5c678181fb4f266ec35627291674475918505a59dbf SHA512 9fdd644cbb100df9ef2d593a4ba24f9fa4cda242e41e4f909e57f3e23adde566763b50b82c7e756b40623038c3df88df49d59da3efec9509c6fc0b1101bfae5d
+DIST qastools-v0.22.0.tar.gz 289261 BLAKE2B 25ff23753cbc1b4d758ff2f42b9022785391c61d9211e0024b55cc08841f41cdf0468c485af9e459dc8b65dac526b8238947419c36003d556e8e1fa13a4896e8 SHA512 9656960095520a1bee58efa3985dda30fae1b6be666dfd65b50cb582be21a40d273a1c06b69e870bc2b467f5d644b22ea30c2fd73eee9057b50de5e85864d712
 DIST qastools_0.21.0.tar.xz 206548 BLAKE2B e9a8e9f20aa6d0388f16866911c0bc85da28ff51e6e23d3d61fd2bd0fc1540630caf4f95807d6072c96f73372d4633eef7f9148a9940552e9bd0c76fba7de20e SHA512 17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b
 EBUILD qastools-0.21.0.ebuild 676 BLAKE2B 9a472ba6e291477c858996f91eee97ec732221c33d09e4681b18350a4ab92c3b08ea055ab4611ad5340fd6006554004a7def8bb571fdfa3c5f8cc435c9a542d0 SHA512 82527c93e4b524b63344169c22bcf699fe8302afb357bb9b5eeff89e75c8bed8f33a7ad24c8f4a850162f9137a9bd774b04c06cc65a1d170a533c8cd9319ce86
+EBUILD qastools-0.22.0.ebuild 829 BLAKE2B 9b37e864b14554819d6e3b6ca241e98152b8ff09a71a38eb342dbe059e9eb540c143c02c89b5cc16df0023763de8e84021e1a5dbbad5f06fef6d003d0ba7ed9f SHA512 f8950b1396bca869eae32296ef9f836360cc85660738d0f1fa62761d9424af4962bc1148ce3f53613e4c8365bf31cad714cc436d8fd836144c7a65396f902c63
 MISC metadata.xml 325 BLAKE2B 1568315a082d0a94f0dc43ae932dce5ca93e9cbced0c7cf7f518900b594281f012809f729e62501271606bfd0f31ec04870f3849e47730fb196689f16088b73c SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276
diff --git a/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
new file mode 100644
index 000000000000..49756a91b4c0
--- /dev/null
+++ b/media-sound/qastools/files/qastools-0.22.0-nomancompress.patch
@@ -0,0 +1,169 @@
+From 58649d44b4f1362c8fe5f88828be97e10b4fc00b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 8 Jun 2020 11:45:09 +0200
+Subject: [PATCH] Compress manpages optionally
+
+---
+ qasconfig/share/man/CMakeLists.txt | 24 ++++++++++++------------
+ qashctl/share/man/CMakeLists.txt   | 26 +++++++++++++-------------
+ qasmixer/share/man/CMakeLists.txt  | 24 ++++++++++++------------
+ 3 files changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/qasconfig/share/man/CMakeLists.txt b/qasconfig/share/man/CMakeLists.txt
+index 083ca91..628be1b 100644
+--- a/qasconfig/share/man/CMakeLists.txt
++++ b/qasconfig/share/man/CMakeLists.txt
+@@ -1,27 +1,27 @@
+ # Find gzip
+-FIND_PACKAGE ( UnixCommands REQUIRED )
+-
+-IF ( NOT GZIP )
+-	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
+-ENDIF ( NOT GZIP )
+-
++FIND_PACKAGE ( UnixCommands )
+ 
+ # Configure manpages
+ 
+ SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
+ SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
+-SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
++SET ( man_gz .gz )
+ 
+ CONFIGURE_FILE ( ${man_src} ${man_plain} )
+ 
+ 
+ # Compress manpages
+ 
++IF ( NOT GZIP )
++	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
++	SET ( man_gz "" )
++ELSE()
+ ADD_CUSTOM_COMMAND (
+-	OUTPUT ${man_gz}
+-	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
++	OUTPUT ${man_plain}${man_gz}
++	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
+ 	DEPENDS ${man_plain}
+-	COMMENT "Building ${man_gz}" )
++	COMMENT "Building ${man_plain}${man_gz}" )
++ENDIF()
+ 
+ ADD_CUSTOM_TARGET (
+ 	qasconfig_manpage ALL
+@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
+ 
+ # Installation of the manpage
+ 
+-INSTALL ( FILES ${man_gz}
++INSTALL ( FILES ${man_plain}${man_gz}
+ 	DESTINATION ${INSTALL_DIR_MAN}
+-	RENAME ${PROGRAM_NAME}.1.gz )
++	RENAME ${PROGRAM_NAME}.1${man_gz} )
+diff --git a/qashctl/share/man/CMakeLists.txt b/qashctl/share/man/CMakeLists.txt
+index 911ea43..5f6ba15 100644
+--- a/qashctl/share/man/CMakeLists.txt
++++ b/qashctl/share/man/CMakeLists.txt
+@@ -1,35 +1,35 @@
+ # Find gzip
+-FIND_PACKAGE ( UnixCommands REQUIRED )
+-
+-IF ( NOT GZIP )
+-	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
+-ENDIF ( NOT GZIP )
+-
++FIND_PACKAGE ( UnixCommands )
+ 
+ # Configure manpages
+ 
+ SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
+ SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
+-SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
++SET ( man_gz .gz )
+ 
+ CONFIGURE_FILE ( ${man_src} ${man_plain} )
+ 
+ 
+ # Compress manpages
+ 
++IF ( NOT GZIP )
++	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
++	SET ( man_gz "" )
++ELSE()
+ ADD_CUSTOM_COMMAND (
+-	OUTPUT ${man_gz}
+-	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
++	OUTPUT ${man_plain}${man_gz}
++	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
+ 	DEPENDS ${man_plain}
+-	COMMENT "Building ${man_gz}" )
++	COMMENT "Building ${man_plain}${man_gz}" )
++ENDIF()
+ 
+ ADD_CUSTOM_TARGET (
+ 	qashctl_manpage ALL
+-	DEPENDS ${man_gz} )
++	DEPENDS ${man_plain}${man_gz} )
+ 
+ 
+ # Installation of the manpage
+ 
+-INSTALL ( FILES ${man_gz}
++INSTALL ( FILES ${man_plain}${man_gz}
+ 	DESTINATION ${INSTALL_DIR_MAN}
+-	RENAME ${PROGRAM_NAME}.1.gz )
++	RENAME ${PROGRAM_NAME}.1${man_gz} )
+diff --git a/qasmixer/share/man/CMakeLists.txt b/qasmixer/share/man/CMakeLists.txt
+index 5aea9af..c2bd872 100644
+--- a/qasmixer/share/man/CMakeLists.txt
++++ b/qasmixer/share/man/CMakeLists.txt
+@@ -1,27 +1,27 @@
+ # Find gzip
+-FIND_PACKAGE ( UnixCommands REQUIRED )
+-
+-IF ( NOT GZIP )
+-	MESSAGE ( FATAL_ERROR "Unable to find 'gzip' program" )
+-ENDIF ( NOT GZIP )
+-
++FIND_PACKAGE ( UnixCommands )
+ 
+ # Configure manpages
+ 
+ SET ( man_src  ${CMAKE_CURRENT_SOURCE_DIR}/manpage.1.cmake )
+ SET ( man_plain ${CMAKE_CURRENT_BINARY_DIR}/manpage.1 )
+-SET ( man_gz ${CMAKE_CURRENT_BINARY_DIR}/manpage.1.gz )
++SET ( man_gz .gz )
+ 
+ CONFIGURE_FILE ( ${man_src} ${man_plain} )
+ 
+ 
+ # Compress manpages
+ 
++IF ( NOT GZIP )
++	MESSAGE ( STATUS "Unable to find 'gzip' program, not compressing manpage" )
++	SET ( man_gz "" )
++ELSE()
+ ADD_CUSTOM_COMMAND (
+-	OUTPUT ${man_gz}
+-	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_gz}
++	OUTPUT ${man_plain}${man_gz}
++	COMMAND ${GZIP} -c -9 ${man_plain} > ${man_plain}${man_gz}
+ 	DEPENDS ${man_plain}
+-	COMMENT "Building ${man_gz}" )
++	COMMENT "Building ${man_plain}${man_gz}" )
++ENDIF()
+ 
+ ADD_CUSTOM_TARGET (
+ 	qasmixer_manpage ALL
+@@ -30,6 +30,6 @@ ADD_CUSTOM_TARGET (
+ 
+ # Installation of the manpage
+ 
+-INSTALL ( FILES ${man_gz}
++INSTALL ( FILES ${man_plain}${man_gz}
+ 	DESTINATION ${INSTALL_DIR_MAN}
+-	RENAME ${PROGRAM_NAME}.1.gz )
++	RENAME ${PROGRAM_NAME}.1${man_gz} )
+-- 
+2.27.0
+
diff --git a/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
new file mode 100644
index 000000000000..606630d7eebb
--- /dev/null
+++ b/media-sound/qastools/files/qastools-0.22.0-qt-5.15.patch
@@ -0,0 +1,64 @@
+From 9975fe653c8159504807ca6288bd974b4f6057b7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 8 Jun 2020 11:01:33 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath includes)
+
+Fixes https://gitlab.com/sebholt/qastools/-/issues/1
+---
+ shared/src/wdg/ds_slider_painter_bevelled.cpp | 1 +
+ shared/src/wdg/ds_switch_painter_circle.cpp   | 1 +
+ shared/src/wdg/ds_switch_painter_close.cpp    | 1 +
+ shared/src/wdg/sliders_pad_style.hpp          | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/shared/src/wdg/ds_slider_painter_bevelled.cpp b/shared/src/wdg/ds_slider_painter_bevelled.cpp
+index 3c90143..1748c6e 100644
+--- a/shared/src/wdg/ds_slider_painter_bevelled.cpp
++++ b/shared/src/wdg/ds_slider_painter_bevelled.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLinearGradient>
+ #include <QRadialGradient>
+ #include <QScopedPointer>
+diff --git a/shared/src/wdg/ds_switch_painter_circle.cpp b/shared/src/wdg/ds_switch_painter_circle.cpp
+index 32fa8f1..36933af 100644
+--- a/shared/src/wdg/ds_switch_painter_circle.cpp
++++ b/shared/src/wdg/ds_switch_painter_circle.cpp
+@@ -13,6 +13,7 @@
+ 
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadialGradient>
+ #include <QScopedPointer>
+ 
+diff --git a/shared/src/wdg/ds_switch_painter_close.cpp b/shared/src/wdg/ds_switch_painter_close.cpp
+index ef058a3..76932cc 100644
+--- a/shared/src/wdg/ds_switch_painter_close.cpp
++++ b/shared/src/wdg/ds_switch_painter_close.cpp
+@@ -13,6 +13,7 @@
+ 
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadialGradient>
+ #include <QScopedPointer>
+ 
+diff --git a/shared/src/wdg/sliders_pad_style.hpp b/shared/src/wdg/sliders_pad_style.hpp
+index 3108f92..81a9075 100644
+--- a/shared/src/wdg/sliders_pad_style.hpp
++++ b/shared/src/wdg/sliders_pad_style.hpp
+@@ -5,6 +5,7 @@
+ #define __INC_sliders_pad_style_hpp__
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPicture>
+ #include <QPen>
+ 
+-- 
+2.27.0
+
diff --git a/media-sound/qastools/qastools-0.22.0.ebuild b/media-sound/qastools/qastools-0.22.0.ebuild
new file mode 100644
index 000000000000..040661446193
--- /dev/null
+++ b/media-sound/qastools/qastools-0.22.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser"
+HOMEPAGE="https://gitlab.com/sebholt/qastools"
+SRC_URI="https://gitlab.com/sebholt/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/libudev:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.15.patch"
+	"${FILESDIR}/${P}-nomancompress.patch"
+)
+
+S="${WORKDIR}"/${PN}-v${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKIP_LICENSE_INSTALL=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_UnixCommands=ON
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 27b77961f79d..b0e284f632da 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
-DIST strawberry-0.6.10.tar.xz 9283932 BLAKE2B 0625f5b821bc56877b0f0185e8368017d10cf1da9a587e0446b2b6b6130da02022010d6b713c1f74f77af8c14589f900d060b3f1799f65ddaf0609a255acf5c4 SHA512 2495df4b7fafa2c0dfd87aa9ca37372782275db333241c334433a40f8c2e6400e79943a406ac553e8b657d3633d9e59de265088359b9589354b8e9d3d06d3637
 DIST strawberry-0.6.11.tar.xz 9295808 BLAKE2B f772e80714a4165d996b117f17503b91d70dc651d4f151f8468200637e5f5a307d566634e197a19464cee7c0bbe5c825be9af88ff503b6eb4d6088b38f4e597f SHA512 f044e1b75ef6617f9901c7fa95020ca84030aa5011f8d9122e92d3d47ab90f6eb55e7e01d88d925a8a00b046810d1ba65070707650d3c465a2cef7dd228f3c2d
-EBUILD strawberry-0.6.10.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6
+DIST strawberry-0.6.12.tar.xz 9311104 BLAKE2B 331c2605616791f4b355bbf0e78738b0b91ca6da7533f676289e0b2ab8a5895a6eb85f605114f782f574c7530db812fb7043580f73a86f9c506c08549f9b643d SHA512 cce4fcef1cc3700dcbab9a9ac8d1cb72d2f0b1b6072002bd837825c2504b42ad2f2f8c2a23a600cf9c12c91ce6628130c166779eb6902aedb12835ff3765ee12
 EBUILD strawberry-0.6.11.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6
+EBUILD strawberry-0.6.12.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6
 EBUILD strawberry-9999.ebuild 2852 BLAKE2B bacd02806b14de945ed9fe5a3047f913ae5cedb3fe4b8eefef61db513d5e1eb731603c6b3cd5643df3919878cb74b6064e7f7625744e60b914f3d078c489db05 SHA512 4a818f39b9fcdc8c49f7274835690e190d18f5cbe2e8e929279d20cf2cb184cb4c15b83ea9810d019a178064d91fd14f618109e3dd21494926efc0f7e4d4f4f6
 MISC metadata.xml 448 BLAKE2B b29c1b35e64c59667f04698cb2d1c039fc7557aa7ad99fb1a8625b68d960b0e7af62e016aaf1ec68d5c44c77126f71047b046164c29a0e80d49cdcda0973ca6d SHA512 2c5af38b8518b1de981bae14422bf5931b76831c0b52b1fce29e187d9ceb25a947d8d0f7db1e7844e90ec14657cc8ab484726b31c89667e89d9fcfb6d2e7dfe7
diff --git a/media-sound/strawberry/strawberry-0.6.10.ebuild b/media-sound/strawberry/strawberry-0.6.12.ebuild
index 54ca03a40f5c..54ca03a40f5c 100644
--- a/media-sound/strawberry/strawberry-0.6.10.ebuild
+++ b/media-sound/strawberry/strawberry-0.6.12.ebuild
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index a1d3f32750a7..617f01ed91da 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,3 @@
-DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce
 DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
-EBUILD yoshimi-1.7.0.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116
-EBUILD yoshimi-1.7.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7
+EBUILD yoshimi-1.7.1.ebuild 1030 BLAKE2B e286e7db79f8595f94e0c26b0ca2e94f3a943b52e3f4279fce98761066b37749e8b896df65cf99bac91447bd1fa1d2c28cf3ad552b331daef08b179ae1e14bae SHA512 f1227911ac91c486653db9ee7dcb882d0217aec1cd42eb159dad628aedf99d9bafd61ad293dd20c40c26c731d37ea2940ebbbfb979c4420790daa6ce15616116
 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152
diff --git a/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
deleted file mode 100644
index d9faf9344bfe..000000000000
--- a/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg flag-o-matic
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/mxml-2.5
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-DOCS=( Changelog README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}
diff --git a/media-sound/yoshimi/yoshimi-1.7.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1.ebuild
index e4c00e99a9c0..d9faf9344bfe 100644
--- a/media-sound/yoshimi/yoshimi-1.7.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-sound
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)