gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-sound
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
142 files changed, 1003 insertions, 1830 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b61b658d33e5..06e21441bc67 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 9a4d1c734ac5..9fb62b00da20 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,3 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r1.ebuild 1918 BLAKE2B df8b7b54c08e91d1973a57f01e06818e16317854b321618ba7f5bb8ca7bfe50be17a90a719613b56e6663b5bf528bafddd4b0c0efb2507218e31bf31fa8e7271 SHA512 3b8871d3dfade6ad15fda2ff927b960a6ab5893e8c90b94354c1266ae93164c50bc7797933763c32fd8f9b4a6ae06acac86fba92ef21f450b52877ecbaebdc89
+EBUILD alsaplayer-0.99.81-r1.ebuild 1922 BLAKE2B 8177b37e602cafa2b99228504632cba5a17c051eb109f42cf9cb05ad7152febf0e9b7711434301a50032b0db4ddfaff35a66e523a9da21bf224a96042a866d8a SHA512 c92cb19eb3fe57f57ed93ae6de86cbb01998f4ff9e100ef16eedb6479649ae3153f87e3044c2892b66527ba854b4c1a1bc007a726f273221eea6a652af0bbc68
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
index 54627dd53847..27659636bbb5 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools desktop
+inherit autotools desktop xdg
 
 DESCRIPTION="A heavily multi-threaded pluggable audio player"
 HOMEPAGE="http://www.alsaplayer.org/"
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 8d57d9bf08a5..f857a21b7830 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -5,5 +5,5 @@ AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6
 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf SHA512 366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007
 EBUILD apulse-0.1.12-r4.ebuild 1449 BLAKE2B a906511d311d43c9c45f8f292c02b98add6e3d74d7fc9402a4ec9a6629ce70cdb839a98a5a23179ccdb8e821fc3016cabdb5679f4a2ddb4c0de02efd6202e8a3 SHA512 2b865a68d87ee96c614f92263936c3d9f0a183a603af84b8b46f306173b06ddd86a553b3f1c05fa8a860c2fe3582e0f650c14f29d2530b138e0ace95bf60bccc
-EBUILD apulse-0.1.13.ebuild 1472 BLAKE2B a9899626b79dd5a331adbfc6991b9a418823dedfbcc07a25c4e81cd1c1b22b2346a6429cf824409e2d12bcb1f4137a69c9a0e8e8e6fbcab5e35f25b889edd35d SHA512 e147ffd403a7d333f49a9de6c0988dc629d0e0356e517afea75fe4c85fd552fac82272aa3ad6ac7446c17b17487a2f59449e9d8ba32ce6ac643eacb251ec22cc
+EBUILD apulse-0.1.13.ebuild 1667 BLAKE2B 5df24b01448d1abbf4b64d30f101d8bec0a98c8f9baa1978694190cc1fc27ce3b0e883da54e712aabee300bdfef001954a6fbef49d9bea29751ddffbe29281df SHA512 db031f1f5797ec0899577688bd4487636651f942496cfdf9e27bf96153ba666161c490264ef3bd9198472064529d4c99a2b35d942cddca611ed09dfdc7d7687d
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.13.ebuild b/media-sound/apulse/apulse-0.1.13.ebuild
index 350f525f8b20..30be8c6e7639 100644
--- a/media-sound/apulse/apulse-0.1.13.ebuild
+++ b/media-sound/apulse/apulse-0.1.13.ebuild
@@ -51,7 +51,14 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	emake check
+	_test() {
+		pushd tests || die
+		cmake -S "${S}/tests" -B . || die
+		emake test_ringbuffer
+		ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" || die
+		popd || die
+	}
+	multilib_foreach_abi _test
 }
 
 multilib_src_install_all() {
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index b98a01f1e878..1c92f9bd85db 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -2,6 +2,5 @@ AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
-EBUILD aqualung-1.0-r3.ebuild 2422 BLAKE2B 8fcce45ccc5062d388cd9c65d544e3baab1ec5a474b4fac3a4655cb0586b60458260c3d43083a0da855e18ea1ea10db39f2eb8533dbe73c4c7ce72d516ae84f4 SHA512 0ddbbefa25223761470a898eca0a08bafa6398ad467e681618d91b0886643d97aa6001596f4dff2942e2182b6dac2020a1e36d9e32b52b60ebb0de225f38059b
 EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild b/media-sound/aqualung/aqualung-1.0-r3.ebuild
deleted file mode 100644
index 130bb2e40c72..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-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"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-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 )
-	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}
-"
-
-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/ardour/Manifest b/media-sound/ardour/Manifest
index ee7399ec51d6..ec9b5fb7d2b0 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,8 @@
 AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051bde2e1c77035e6c1295ec44fa7483e2a1cb0a92cfd7d26ebb7df9919390e462a50e269a38174d6ff54c6c5e358eb51 SHA512 98b3d10d6b7ee371ce2b32c2ec730555739188b555f273198b6e096972d58f37d49d205e6de97299b8cfcaa8ad5c27d461207fa6ea02999dc0ddc7e375c5fd9e
+AUX ardour-6.2-use-signed-int-for-atomic-operations.patch 2015 BLAKE2B 535da9c7318a2c5e12f2d531acb09a47ebcb570bd59583e5683df05c1067d81e09f0fbd7a45f89843571fbc3a655c68bf11313c4aa73f9ce02fdc52c68414fae SHA512 720ee2920cbb88ff5266202ffdf5464503550f47fa440466aa241e89380548c31079700a1cf55dd9dd76a4e9185be6fff9ee8d499cc5e0bfc7976a7ebd0869fe
 DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
-EBUILD ardour-6.2-r1.ebuild 4159 BLAKE2B d4be7982a9335ef22798d0368c87706723159be068f900ccf1559bd61d5c2aa2234024d7035618462d805b489354575be14e4162ea7bcd270e2413b5c11e512b SHA512 c88db3ea4f1904e84a1a4e221c3f987419287e6bb64e7ef849669afbb6bb1d7a1177051eb73358f5eaae164b77c988def9c79b07735fe7aeccdd3fa7f04d3923
+DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
+EBUILD ardour-6.2-r1.ebuild 4435 BLAKE2B e546f198d129f4f5193e9f6d153859385fc1e420fd8d9995f73587d9a555522d077bbea684d252770f091c63ba844f24b8564e74b8767fc9e3ff306294f5abf0 SHA512 7c82b2762b3e787fc7276aba9fa68391fc599dc672e72f55d1280a7279c350de27f1a8129c0b55fa672cff2b94c0948d8d7cdb43085bd887793b34f119fd63e2
+EBUILD ardour-6.3.ebuild 4323 BLAKE2B f9970069239670093057c724947e5b2fb5235cea146c201730d702d74567990bc8501b2552a044fbfe38c2171754165b9463711be3f0d2301ee51bd4049a42aa SHA512 a265d4655dfc0bb1d3fcb7bf727ea7481a2ed52e0269b45693f04529a3fda7e4eb6b792d632530eca78f37df978dad8344e8b461cb42a774041adf7cdc53df0b
 EBUILD ardour-9999.ebuild 4103 BLAKE2B 8f9d9dd9726c416cfeca182d72fdf3de6d666e7954c887b451d6b0436224ea6caa5dccd04aaf753c1d25e2ff188017b9c61b22d5603a1dbd79a2d48ce1967e8e SHA512 9ff953c51285b0f978fd9b885a39de70a8758807bf22bb62e37853c6ffe0ced0fde17e7849b9e9b24fc4acf30de507e76a9b8cedb7c9404215d4f2096434d047
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 9935afaf3d5d..82d1575b195a 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
@@ -71,8 +71,14 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-no-nls.patch"
+	"${FILESDIR}/${P}-use-signed-int-for-atomic-operations.patch"
 )
 
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
 pkg_setup() {
 	if has_version \>=dev-libs/libsigc++-2.6 ; then
 		append-cxxflags -std=c++11
diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
new file mode 100644
index 000000000000..6bd303b0e465
--- /dev/null
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	l10n_for_each_disabled_locale_do my_lcmsg
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--configdir=/etc \
+		--optimize \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex phonehome "--phone-home" "--no-phone-home") \
+		$(usex nls "--nls" "--no-nls")
+#not possible right now		--use-external-libs
+}
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
+}
+
+pkg_postinst() {
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
new file mode 100644
index 000000000000..90454593b68d
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
@@ -0,0 +1,69 @@
+From 6d950d15ba5192a86c57d8045d1d26f9ad4be0db Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Thu, 16 Jul 2020 16:13:21 +0200
+Subject: [PATCH] Use signed int for atomic operations -- #8314
+
+---
+ libs/pbd/pbd/mpmc_queue.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libs/pbd/pbd/mpmc_queue.h b/libs/pbd/pbd/mpmc_queue.h
+index a7909a901..2c08068e1 100644
+--- a/libs/pbd/pbd/mpmc_queue.h
++++ b/libs/pbd/pbd/mpmc_queue.h
+@@ -82,7 +82,7 @@ public:
+ 	push_back (T const& data)
+ 	{
+ 		cell_t* cell;
+-		guint   pos = g_atomic_int_get (&_enqueue_pos);
++		gint    pos = g_atomic_int_get (&_enqueue_pos);
+ 		for (;;) {
+ 			cell         = &_buffer[pos & _buffer_mask];
+ 			guint    seq = g_atomic_int_get (&cell->_sequence);
+@@ -108,7 +108,7 @@ public:
+ 	pop_front (T& data)
+ 	{
+ 		cell_t* cell;
+-		guint   pos = g_atomic_int_get (&_dequeue_pos);
++		gint    pos = g_atomic_int_get (&_dequeue_pos);
+ 		for (;;) {
+ 			cell         = &_buffer[pos & _buffer_mask];
+ 			guint    seq = g_atomic_int_get (&cell->_sequence);
+@@ -138,8 +138,8 @@ private:
+ 	cell_t* _buffer;
+ 	size_t  _buffer_mask;
+ 
+-	volatile guint _enqueue_pos;
+-	volatile guint _dequeue_pos;
++	volatile gint _enqueue_pos;
++	volatile gint _dequeue_pos;
+ };
+ 
+ } /* end namespace */
+-- 
+2.28.0
+
+From 9fcb51de2e34f9fee74838e57317ad44d21c40d0 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Thu, 16 Jul 2020 18:07:14 +0200
+Subject: [PATCH] Use signed int for atomic operations part II -- #8314
+
+---
+ libs/ardour/ardour/session.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
+index dcc8c88ed..f491f7f17 100644
+--- a/libs/ardour/ardour/session.h
++++ b/libs/ardour/ardour/session.h
+@@ -1762,7 +1762,7 @@ private:
+ 		OnlyLoop,
+ 	};
+ 
+-	volatile guint _punch_or_loop; // enum PunchLoopLock
++	volatile gint _punch_or_loop; // enum PunchLoopLock
+ 	gint current_usecs_per_track;
+ 
+ 	bool punch_active () const;
+-- 
+2.28.0
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 87c15301433e..e3301b2c4a84 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -16,5 +16,5 @@ DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b
 EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b
-EBUILD audacity-2.4.2-r1.ebuild 3740 BLAKE2B 954a127989760f53e4b3e27ae839b8ac7b159cd0da8048ac54fc77c6b19d2abe0b22cd8a8c12be28d2a1da001d8138708c66514881d331144009433a92c61068 SHA512 bacf06a31cf44b4d01790de4a2a7d92b5de6c526ee4db5c3e9ad51a16820cc509c95cea693abe82eb4df047edf0862932d7c153cd47e48c67898eb81c182ed20
+EBUILD audacity-2.4.2-r1.ebuild 3952 BLAKE2B 0d9d69c47bed14c7647d0b3adccb7407c1b2c6d8ec3287e0b6a810133574d1c20148cf468e460b77d56ee47fed6ca7dde8f253861dbc14e64adfaa2c1a143d62 SHA512 fdfd36cc360d998899e62237e89fbe11ecdcdc3ca656f4a7dc8345ffb63c85fc9e24a665d167d068398e6b4798f5f5f46cae3d7427dc9c00d6baa616bce7d334
 MISC metadata.xml 1343 BLAKE2B 5bd530b1826b79a7b2ed54ebe055f752b8cdeb0d4e837d184deefb4ce8a2395e243d690bb0775d4e022d990533b55c9c6d7fed1c60c213e09fe351e161530b36 SHA512 ff75ba648bbbcff37e9529b8b52a1c6b86aadc8b650d6e121e1e5296514f1adeee0b52e37856c466c1c88baf7fcfcc3db6bcb935100e8a623dfd8926e697c6e5
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index f7df783a70cd..a8acc69fa8ea 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
 	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 
@@ -111,6 +111,10 @@ src_configure() {
 	)
 
 	cmake_src_configure
+
+	# if git is not installed, this (empty) file is not being created and the compilation fails
+	# so we create it manually
+	touch "${BUILD_DIR}/src/private/RevisionIdent.h" || die "failed to create file"
 }
 
 src_install() {
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
index 11b48552a3c5..a16cbb171fec 100644
--- a/media-sound/audiotag/Manifest
+++ b/media-sound/audiotag/Manifest
@@ -1,3 +1,3 @@
 DIST audiotag-0.19.tar.bz2 15016 BLAKE2B d650887a72242d1258fa2d60a876a6c5984369074d16e4f9028468f6520b38afad4a5cf92ba5c2a92f7f2a26b1aaf515998fa1a3fbd6d8d49d15074c68940c14 SHA512 a2e117deb78c3141ca1e17a12ee17033eb762fee822187d8aa708715ee4077b120ea2f7acf09d683d9dd292c0826e1152d09286830976b65d08738ced9a0529e
-EBUILD audiotag-0.19-r1.ebuild 724 BLAKE2B 6f0a8d44eda19a00d86184dfe5e5f3c8884f5745e8134b2258d005c2eb2e2df4bd93362e6fa37a5d8179da01e98818aef99e0e60ffd207ebfae9f69c0fe707d9 SHA512 f566ccfa3b0e772a2e6f3db8943aca55ccaa956ab192f483e350679a25bb83bc162a9da7809f936007adf5cbc768d170fd7334cba26ccbb208d0c43ee613135f
+EBUILD audiotag-0.19-r1.ebuild 728 BLAKE2B 6efb1025b0aea8334c2d0ec2ceae9a2a8b5f5b742174fd94a5ae215d40edc04e95fd5c3b53079b4119a878ff5c4ff283844c70502bdfad416cb3054814ea3538 SHA512 88b735e008f4eb72f7825208e7220778f92d734bf8f1b8f32891a54323d96e59f749a312cfd4b305d7045403d955eef0a5ab99e2301c6974a2bce7d5cd19bdf2
 MISC metadata.xml 335 BLAKE2B 1ef03cdff887802e47c3e25d41673ea2c25129b2c43129a72d717249da1208b4445d6d03557b2427f6aa6d7f3e34de9bcaf2c696aad214e842dfdc4782a96cb5 SHA512 6652048b2ed7c99882375c57521d9a2a75cd07a8a54ef88ba351f93212e4cfc42a5eca93572b0ef956696d0fae61a741957b146ae048f5a954b0a0954486507a
diff --git a/media-sound/audiotag/audiotag-0.19-r1.ebuild b/media-sound/audiotag/audiotag-0.19-r1.ebuild
index 02c0389a093a..bffb56f6602f 100644
--- a/media-sound/audiotag/audiotag-0.19-r1.ebuild
+++ b/media-sound/audiotag/audiotag-0.19-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="Command-line tool for mass tagging/renaming of audio files"
 HOMEPAGE="https://github.com/Daenyth/audiotag"
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
index 11853e29ca82..830cdbbe28f8 100644
--- a/media-sound/baudline/Manifest
+++ b/media-sound/baudline/Manifest
@@ -2,5 +2,5 @@ DIST baudline_1.08_linux_i686.tar.gz 1945014 BLAKE2B 01dfd3c03a7d5dab3f3d65d6602
 DIST baudline_1.08_linux_ppc.tar.gz 2369780 BLAKE2B 45bb73d76860f7cfb608ffb42e4ecf2c03bc8b32288a51e51ec02998085d7718f88047ec567a3960768003d3e201b0282cc80ac1bc6abc3a6c530690e1b8922d SHA512 7cb43cfec5cced3a6c051fcb56485b9a55d543a988f311f9130a41514d44a47fc0565415b5c9106cdd495283c62f03a137940afae4386fd4e87e3234fdece41f
 DIST baudline_1.08_linux_s390.tar.gz 459868 BLAKE2B 41cb33a5def0caacdf2850e04c3a348bb1181d010b5c2e06387c6a36c55473c44d99d3058614cdae104b04f2f94c0150c81a64c2ee509774ce15c82948fdb658 SHA512 636380e7b67b7885676ab9ae89a2ee97ac5a7934c1636f984ecbabc3bc78a3d1cd2b15a7e0572bb0f7a78d65a69df60550edad424dd102b5b85e244ae87ea5c7
 DIST baudline_1.08_linux_x86_64.tar.gz 2270546 BLAKE2B 722318b4d3a1e244c8e6c57555a29b9b1305c26a3f7711cd13deef3e2f57ed78bdd624947a9db1c10cda2f807c0248e14cd1a0fc28da0a7a0511e41d75fb84cc SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4
-EBUILD baudline-1.08-r1.ebuild 1696 BLAKE2B a4d06c26321c9396d153595181c157e9e956c4a474612670940669ad594bf1ab976319f645a71e6f708e53c162a209e49d15e4d4c8b5ab0ffe47cf341292c767 SHA512 f3a6e8a3f732a6a81db95eed6bc1b8da310edad1320fc0f2aa0a7524d11a4496a9e5b6146aeea2f74ec7fcf00eac444557d5e5d8b4749b2e5c22771421381902
+EBUILD baudline-1.08-r1.ebuild 1697 BLAKE2B 17258f14d6899dce9dd8269805a922c0d919f9ac05d59017b8151090e2071db73e228f9d9514c36dd76f94e434941fcd8c8fe50a6cd95c3b255c4c3630e71a0b SHA512 7a864cf511bbc333f7f2e35618376a92a4063249e983c8637376ff598f1dd5e45cd6f19b74fe73f2571c9646ed67b3bb036b56bfcf80544da0d4d207d7c47411
 MISC metadata.xml 783 BLAKE2B 1091fa7f98ee5a548e558bb0faf1f1a354575d0832ddca9dd6d3137f9b1c6d848a9ddd14d22f22b57d8fe5f88a18456a0a0f3da1249756826d67c60e5c29ea72 SHA512 f58c345d9ac036c5c3170d9093f5b8edf15db9a302e37675588ab734bb3898533dbdeaaa8d59a889843d456f7717996071810d811d58426ee43e4c3e0d354c5d
diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r1.ebuild
index c5af15f0b264..54a34b12b4d5 100644
--- a/media-sound/baudline/baudline-1.08-r1.ebuild
+++ b/media-sound/baudline/baudline-1.08-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils xdg
 
 DESCRIPTION="A time-frequency browser designed for visualization of spectral domains"
 HOMEPAGE="http://www.baudline.com/"
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index e4baa614fc97..6fdbeea2eb19 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,6 @@
+AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
-EBUILD cadence-0.9.1.ebuild 2410 BLAKE2B 2d1e0b36ea3d2ba7b040e940a9a9e7ac5849d9b2362fd3dc87647073ae919f41784a889d00165d94f5bbc69a855d09d6d3741aeb0f50f0ebb80ca4d1669ecab2 SHA512 7ed6d65a4437d3620e39f0c6377c0ff1ec6eb2181a812697522a8a5e662ef9d55276dcce6c2aa2447bb6e670ce8ec4373c2846e645616ccb9c555e7393788f4c
-EBUILD cadence-9999.ebuild 2356 BLAKE2B 3e3422570afd70a1e8aa59ddf546aa2e1395a78009372e53c585f6979d82d051ca67fd4f35989b2a3140cb6ca317eb59476e2f8d5f6418d71419a4368ca10887 SHA512 b83ae35507c4f57faf60fb88364e33cc7fc96e7bf4951964c2a6afb80111178fa0633939d99acebcb2f336cf25520af52d788cb06eac3e616c38a20b913a1e53
+EBUILD cadence-0.9.1.ebuild 2446 BLAKE2B 0b6cb6c6ad38b5ef4e687b6f60137f3ae474248d5a36ca64c302652ec550de8a0405f17bd791c9d7942c41470fe4e28d0ef71283e3bec60cde375b505cc29277 SHA512 303a5166fd3c4ad4b17ecd162e11f2e10aadd5c915645f86d44cc36d6753c6158fb5820b56d5130492ba3bb099eebc38a79826c03efea01073f64d5cd97b7930
+EBUILD cadence-9999.ebuild 2412 BLAKE2B ce521fce0aad9cb56b3868b09ae28e267913ab2cee1ee8b42445b59ca45fef45e6e3906583e3d5666a3a72390c08ab239fb7ead259338b10c6b38ea54f1e398c SHA512 99de5daa886120a2cb05ebbb6e4a03c1665fdc2ea58b3d922a4028c0ccf144508ef3a02ba69f88421df48de182a7bca9e44859c98f074376a63dbe4f664c882a
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 6185958b360d..0876fccd26df 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-fix-clang.patch
 	"${FILESDIR}"/${P}-fix-qt5.15.patch
 )
 
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index b0f1b5c66689..78605b5cf613 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -40,6 +40,10 @@ CDEPEND="
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
+)
+
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
 		data/cadence \
diff --git a/media-sound/cadence/files/cadence-0.9.1-fix-clang.patch b/media-sound/cadence/files/cadence-0.9.1-fix-clang.patch
new file mode 100644
index 000000000000..30cc6250be20
--- /dev/null
+++ b/media-sound/cadence/files/cadence-0.9.1-fix-clang.patch
@@ -0,0 +1,17 @@
+diff --git a/c++/jackbridge/JackBridgeDefines.hpp b/c++/jackbridge/JackBridgeDefines.hpp
+index a59f58a..8655291 100644
+--- a/c++/jackbridge/JackBridgeDefines.hpp
++++ b/c++/jackbridge/JackBridgeDefines.hpp
+@@ -50,12 +50,6 @@
+ # endif
+ #endif
+ 
+-#ifndef JACKBRIDGE_PROPER_CPP11_SUPPORT
+-# define override
+-# define noexcept
+-# define nullptr (0)
+-#endif
+-
+ // Common includes
+ #ifdef JACKBRIDGE_OS_WIN
+ # include <winsock2.h>
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 2ab91b619954..f24d92967293 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,5 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
-AUX chuck-1.4.0.0-makefile.patch 929 BLAKE2B 1bb70bc169faf5138b3e0d4b60c60366bc6e60a366f2eee3d18c3093b5f2d99e821e0fc948b6a79205500884b8babd12a6676d31c65435f37bf73dedbf5aec74 SHA512 4ceda974263f3a043f187f7d95aae7a16fc65936c7a687f6fa0003a51493caa6eebc8e932075a274373fd319a1c0fb329e1764fc756c4b1691c1dfd8443be836
+AUX chuck-1.4.0.0-makefile.patch 941 BLAKE2B 64ef7342c0c07ca573efb7e7142854a4d366494983b400af484d9c0354cc662d1090bf6396e4955634ab2e1c9864a5011a8dcc6fe1213c02d4491cd9b57fb729 SHA512 3bb7cb3fa04863c2a4debf5eade64233d3d3ce38272f2d73d14d1772895c5f88ec415b1c22aa3b077204d4569a24ad25c6ca757e2c6a4df31e9fe48eea9c9fdc
 DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
-EBUILD chuck-1.4.0.1.ebuild 1865 BLAKE2B 3f23893fdd7b75ce1ec7b0fa564e8458ebce4d0b57611e00b9cfd9a37f812687397f8a7eacc1fba74379bfb0e5a2d17d273d2cffc94a02000e5ef24a23c3f92e SHA512 540b2e1faa688eb089666eb2cf79a9bd762b4c165526da7388a5fcc25f1e56ea178044e3831d2d21a5fd3136c53d5a5c146978aec78b72a24b2f2ba5035c6f80
+EBUILD chuck-1.4.0.1.ebuild 1863 BLAKE2B c7a8b58e5f32faad1f8ba5e378895198dff5f708dbd26812297aa10121019f1a8fe98997f3d9df5da32685af90aa1e394fb92cc6d78a89de3f7702155c53515f SHA512 b6f176f21295c705e0e39aea0cae97465e7dadd5a02267a5822dcb5910c360e1c7e6ff9658c5b73df88467b4970d01dda6cbcef079b612d2284c8496950eeea5
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.4.0.1.ebuild b/media-sound/chuck/chuck-1.4.0.1.ebuild
index 81fd7cd02477..cddaef76f39b 100644
--- a/media-sound/chuck/chuck-1.4.0.1.ebuild
+++ b/media-sound/chuck/chuck-1.4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack examples"
 REQUIRED_USE="|| ( alsa jack )"
 
diff --git a/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch b/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
index b601726d42f9..f8c6561a8141 100644
--- a/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
+++ b/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
@@ -14,7 +14,7 @@
 @@ -1,4 +1,4 @@
  
 -CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
  LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
  
 --- chuck-1.4.0.0/src/core/makefile.x/makefile.jack
@@ -22,6 +22,6 @@
 @@ -1,4 +1,4 @@
  
 -CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
  LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
  
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index effa2b2df1a4..ec6d3e29e315 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,5 +1,6 @@
+AUX darkice-1.3-include.patch 636 BLAKE2B 3598cf32c662453b1d4d7607b5c032e637a951fcd67943515f28bcccafb6e1110f64916563de9406a96d439990ee683a4151805ceafe08d8a44b52d49c30ae51 SHA512 14b461fe4282f9389d8a97d4b4942c0b7866860aabd91589bd6294a34796b6a0e74658ed8a0e43273fdc72bf776c14b6cf8889a1f31975ab6609f34021fdb434
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
-EBUILD darkice-1.3.ebuild 1256 BLAKE2B d52b4d5ea2d885e1fdc23e8dc8fb531073ffea47633eb1b7c5d2f27db47f02a734638de1e77e30f09e5923d0376740d68b4da596a95a5a7945f6f4cd3e5eda42 SHA512 5fdde41f5a0874799e41a89e737e559ee4f58351c884979f8e39e0050517ffb6d4ec8fe1eb76b871a4b92dcadef179b402baf6e26c829ea3703bc963781a5a13
-EBUILD darkice-1.4.ebuild 1277 BLAKE2B d5106bb22bd49f0561ffcac079d1ceafc96ece74ef2d96d9d7828d834e46df9bb54faa5677933a6e4baf9806d04079cf936aedc33fec236c4b217a26ab5db5c4 SHA512 bc8061f7ff7545b317af30ad76bd7910d4ed00a730adf1a8cb3cd7b77e4aa4b1908203b77a58be4266a478b7ba596c6fb1ee1aefe9abaad3bacf7b8dd2e39c20
+EBUILD darkice-1.3.ebuild 1303 BLAKE2B c3c2ce08898fc8c1808db54aedd80e8f8a0dfb8fd1230de5c7b8a4d08d7901989887ac747c8c7cac8f98d1824bf34fda8be76ab4c3068e414739880862f48803 SHA512 55e372760bb5265c0514e0065339e03534a139ba3be66b1d0c56097a315e1e1ac9bdda7db8ecad905662eb6d07d8ecce0bd523b88c9ed080abc631bb27336f2b
+EBUILD darkice-1.4.ebuild 1326 BLAKE2B 484448a936363221c9101fa1db80c5b5df5aa37a1cbbbb33279b55ba952454f0f5289a48567c5094fdfa040df5c4539bc82a7f3453168c4210c8a501dada6e68 SHA512 6373f691ef14d967c176126aa0cc78a8ff940f47e58e20d42be4f0ba02beb7965db7644b0907899eae0949dd445bcc86dd12e53fea35dd9a41bfb3c3be1986bb
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
index 630f69949edd..20d7d39cbaf0 100644
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ b/media-sound/darkice/darkice-1.3.ebuild
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}"
 REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-include.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild
index 0c54f4f70ac0..b7a41066988a 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc sparc x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
@@ -29,6 +29,10 @@ REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3-include.patch"
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/media-sound/darkice/files/darkice-1.3-include.patch b/media-sound/darkice/files/darkice-1.3-include.patch
new file mode 100644
index 000000000000..dd2e135e8782
--- /dev/null
+++ b/media-sound/darkice/files/darkice-1.3-include.patch
@@ -0,0 +1,26 @@
+diff --git a/src/FaacEncoder.cpp b/src/FaacEncoder.cpp
+index 873c560..3f7dc75 100644
+--- a/src/FaacEncoder.cpp
++++ b/src/FaacEncoder.cpp
+@@ -36,7 +36,7 @@
+ // compile the whole file only if faac support configured in
+ #ifdef HAVE_FAAC_LIB
+ 
+-
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Util.h"
+diff --git a/src/aacPlusEncoder.cpp b/src/aacPlusEncoder.cpp
+index 70831b6..1f2ec20 100644
+--- a/src/aacPlusEncoder.cpp
++++ b/src/aacPlusEncoder.cpp
+@@ -36,7 +36,7 @@
+ // compile the whole file only if aacplus support configured in
+ #ifdef HAVE_AACPLUS_LIB
+ 
+-
++#include <string.h>
+ 
+ #include "Exception.h"
+ #include "Util.h"
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 6dcdbb3f77e0..615cc8e4f603 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,9 @@
 AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
 AUX din-47.1-makefile.patch 588 BLAKE2B 5afba801148decc167b4d7bf50ce1b0e770f37d6f85806b151a35958b43749ce7f7a3fd70fbd5028e2d301737011bdcf2fa9f58c7c91ef34f7859bb4071ec1d3 SHA512 d19c72a72b2e3d081e12eb46114a3176b4ea497687df1d017e8c4ba8f1a7a049df169384f4345b45d97688544c7dace2ccc339aa9f64d65ae90657d73a271fdd
+AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
+AUX din-48-makefile.patch 1886 BLAKE2B 091197f5d2bd421be5ebd2a6d9dc90d5a6f34a65c2e26bf3b639312b15017b61162922ff3834f3f00a7ad098eff2397ad312057c0ba712d0e9a88a83973d3e97 SHA512 f451ccdfdc7c17b975a3b0077bb92f5131c9e22bb9bf224d3b991c3e61679dfc602642311f05b47ecb0ad0963d554467e697e4ec0b15f775af93e9d3299d3369
 DIST din-47.1.tar.gz 3667502 BLAKE2B 21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786 SHA512 883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17
+DIST din-48.tar.gz 3673917 BLAKE2B 90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1 SHA512 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
 EBUILD din-47.1.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510
+EBUILD din-48.ebuild 1078 BLAKE2B 68d5d618a2a3d165f6ba9f31393244ccf583a216ae30e1d9aec081381ae255bec06d7b110feec5b1a4b12673a7ca2c4574158c2d668f239dfc605440b7e2ec2a SHA512 2fdf558fafff9ebead738b57f63b3b1e70f111e0ccfed2b05e0f4b4fec71d6746a6dcce0633d3fee3666a37646b12153d99323aa8e3b7bb8ee3eb5aada1101b7
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-48.ebuild b/media-sound/din/din-48.ebuild
new file mode 100644
index 000000000000..14fecc8a11cf
--- /dev/null
+++ b/media-sound/din/din-48.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/din/files/din-48-fix-random-constants.patch b/media-sound/din/files/din-48-fix-random-constants.patch
new file mode 100644
index 000000000000..8e60204ad429
--- /dev/null
+++ b/media-sound/din/files/din-48-fix-random-constants.patch
@@ -0,0 +1,15 @@
+diff --git a/src/random.h b/src/random.h
+index d5a2bc6..38f0d14 100644
+--- a/src/random.h
++++ b/src/random.h
+@@ -16,8 +16,8 @@
+ const int N = 624;
+ const int M = 397;
+ const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
+-const int UPPER_MASK = 0x80000000; /* most significant w-r bits */
+-const int LOWER_MASK = 0x7fffffff; /* least significant r bits */
++const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */
++const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */
+ 
+ static unsigned int mt[N]; /* the array for the state vector  */
+ static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
diff --git a/media-sound/din/files/din-48-makefile.patch b/media-sound/din/files/din-48-makefile.patch
new file mode 100644
index 000000000000..5a37359106da
--- /dev/null
+++ b/media-sound/din/files/din-48-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index df480f2..d665bbf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+ din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index d78afc718a75..e5425ddfbd2f 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,7 +1,5 @@
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
-DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
-EBUILD ecasound-2.6.0-r1.ebuild 1727 BLAKE2B cb86bb09597a3acc6a6417234ff3acd299eb009ca00c57d0b8dbf617a6460d741df22d2f6ba9b8522ebe083ad6b5eb392f30f2bef0a8d5e6c00dbbd34f86e92d SHA512 decedce6d807ca441b8e70f0e5f24f0f60af1ecf66fc5883866fb2fb167b7e4d044d174d05f26c5abb4ce3e1ff8ba9a105a56be58099ac8f9af66483d92eeb2e
-EBUILD ecasound-2.9.3.ebuild 2361 BLAKE2B 553799dac32741f7b69b79073293f375b4ec417a024258b13f9c3a82bd027c56ae0ab94d372e5be964f85fb136d16f37525c3ce5b9a69f8a254eeaaf24e21271 SHA512 519740ed9b74e44f9d335c5e1a5e5db7aff907ca7b8727469597f361aea9ecc74f8e8150a1713f26f7299958ab3763adb08ed32537a0996f3a10a9eb7acdf306
+EBUILD ecasound-2.9.3.ebuild 2360 BLAKE2B 2b5a9afa2fb487f557948a5dce8032bda2fa80b201055967144aec3c843752f62b80f7cb3abbddbb48d19a0b54cc6834d5c9f00ebe1631f4748d21d62f349826 SHA512 4fa747af863356a0d1e0f12ad92104d7b315dbd6fabf9367c1ac8565ad3145643aa2d43d0ed6b88b1a90ef4ca7c7089083fef00fca794f54b89b69f2e18c8d68
 MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c
diff --git a/media-sound/ecasound/ecasound-2.6.0-r1.ebuild b/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
deleted file mode 100644
index bab257a0d55b..000000000000
--- a/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="a package for multitrack audio processing"
-HOMEPAGE="https://ecasound.seul.org/ecasound/"
-SRC_URI="https://${PN}.seul.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa audiofile debug doc jack libsamplerate mikmod ncurses vorbis oss python ruby sndfile"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	jack? ( media-sound/jack-audio-connection-kit )
-	media-libs/ladspa-sdk
-	audiofile? ( media-libs/audiofile )
-	alsa? ( media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )
-	libsamplerate? ( media-libs/libsamplerate )
-	mikmod? ( media-libs/libmikmod:0 )
-	ruby? ( dev-lang/ruby )
-	python? ( dev-lang/python )
-	ncurses? ( sys-libs/ncurses )
-	sndfile? ( media-libs/libsndfile )
-	sys-libs/readline"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local pyconf=()
-
-	if use python ; then
-		pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" )
-	fi
-
-	econf \
-		$(use_enable alsa) \
-		--disable-arts \
-		$(use_enable audiofile) \
-		$(use_enable debug) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate) \
-		$(use_enable ncurses) \
-		$(use_enable oss) \
-		$(use_enable python pyecasound c) \
-		$(use_enable ruby rubyecasound) \
-		$(use_enable sndfile) \
-		--enable-shared \
-		--with-largefile \
-		--enable-sys-readline \
-		"${pyconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use python && python_optimize
-	dodoc BUGS NEWS README TODO
-	use doc && dodoc Documentation/*.html
-}
diff --git a/media-sound/ecasound/ecasound-2.9.3.ebuild b/media-sound/ecasound/ecasound-2.9.3.ebuild
index 1740b8de3da6..fb4f2a248045 100644
--- a/media-sound/ecasound/ecasound-2.9.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
 python ruby sndfile static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index db242b36ced8..148914c1f98d 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-20.04.3.tar.xz 1409336 BLAKE2B a1432294cb46562145ecb6f41b07a8a1ae352abffd40253670ef17b79e27b221b2589bf14934a7ce4e0001f90e84a0889a1b0c4dd069101e2e614f1fc51a20cc SHA512 00afa92eaab736f5f38759a3076b9f579ee3f5fce84404042a73e11cdfe0e004b32a83f9e542ca6d0a962d66bcb3fcce9d12fc5dbdd8f937d9d4cea9321687b4
-DIST elisa-20.08.0.tar.xz 1634132 BLAKE2B bd2286863376e9a376d160663a54b49f1c66bcc4078d9fef3da6672352e45c82bb173e86e04410eb8866f949bf754c14377de1e705c80c56591f6515c1cf5874 SHA512 e4f7352c00199ba0780199a5c7f72ea4f7954bae575dc6fce9786f8957053b34d08877a82c3888495ad4915668c494ddd1388e8fd4173f5e805e229ae7541d62
+DIST elisa-20.08.1.tar.xz 1634492 BLAKE2B 2ea1f8eb1c6e20d7b0e383fc660af2605a30f174110f0ece059d4c063e62811ae8c0ff89225429c00977633d29315e5bbb89e7207a2ca4c6c49fb450fdf25ab2 SHA512 a273fe799c701f1acad3966b382189aa69448ee5b0532ea7c47744f0a350c0125193a49d6a100efd448cfcbc878fb45c6fbc248d9135155fad5fac554b673c93
 EBUILD elisa-20.04.3.ebuild 1677 BLAKE2B 416386698e6beed682083a764e8e93c42ba8f8cefe726009f4772e179dff413a6e9b79b431391216bda5821b7ab42cb3ddde7fc0cd02d4d61fdde66e8214bcc6 SHA512 0e2c57bafd58f7d15a8aa48feb1aff042390a7fb62a6b0704aea1db3fd2e39f4c9852eb3992d391a6562bc824f94db9a41bf06542856c6ea551a3fef18cdadfc
-EBUILD elisa-20.08.0.ebuild 1689 BLAKE2B 610f4e537a77f4a57bc182e0be48fb730ddc2327e3e8dc5d7907f62507ecb3228411d7efc73ef69081935ff1c453ee36282147287c5164c546df8ee2649bf337 SHA512 4c045967e2dccd96f2fca0ff2cc104daecfc8ffe988167fe7a86912e33216696c9c796069c2fee71a59bea0e5c1eb5933990485fc8d6cf3a67d5f56a7d3f5519
+EBUILD elisa-20.08.1.ebuild 1689 BLAKE2B 610f4e537a77f4a57bc182e0be48fb730ddc2327e3e8dc5d7907f62507ecb3228411d7efc73ef69081935ff1c453ee36282147287c5164c546df8ee2649bf337 SHA512 4c045967e2dccd96f2fca0ff2cc104daecfc8ffe988167fe7a86912e33216696c9c796069c2fee71a59bea0e5c1eb5933990485fc8d6cf3a67d5f56a7d3f5519
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.08.0.ebuild b/media-sound/elisa/elisa-20.08.1.ebuild
index a3e77d8776db..a3e77d8776db 100644
--- a/media-sound/elisa/elisa-20.08.0.ebuild
+++ b/media-sound/elisa/elisa-20.08.1.ebuild
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index d73907a9c77d..71f8ce719dc3 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,3 +1,5 @@
 DIST fapg-0.42.tar.gz 94920 BLAKE2B b7da3a9df4b3f61022d237fe2b94238d56ceee456de54843062a887710f8faea17cfc6198487317797d9b16b006ccf311eb8e0f9e9e55a2e5d0aed173758457f SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731
+DIST fapg-0.43.tar.gz 95025 BLAKE2B 33ef8e895ad998fc2d6a1f13c377805d0fdaf55b74adb78e4396f6084be531dc228da59f1a97329cb27cd5eafaad91822b27ad97f72f2f9c75deee7454bd22a8 SHA512 e290db42437a6345b6b1ee5348e95fc611c29ceffdc32baafb2e7aecde87b41e4584e9a06c1cf4c2ca938b3fe2359ba2f8bc4ad7c42923cfb3eef8e9737da64a
 EBUILD fapg-0.42.ebuild 553 BLAKE2B b7251066be27d942369bc8d582b1eac3d7017829b316a2e183c19ae5d31fd51b5f7932d75005fed268c87d9e88d220eb81380700cc4e8c48cf293228a50c66bf SHA512 b57ffe49958596ac8a7f41e1d699c13fd0600aefd5626cd72f94e066d126d3748eb1df1152bca8c57923b5542902de1ea92b8a21f797d26acd86dd33a68f3e92
+EBUILD fapg-0.43.ebuild 556 BLAKE2B a662aa0252ea7119c96e31c9f0da67f241e7ac5b3f0066585a69e3047883cbdcc1f002b86c82a6c25498e3b3bc36fefc5bf80bf56b11585c0628c096f2ba97cd SHA512 21afbd5e20b7da8a23fb42062f3ebe5777e2be345b58a3c026e59bc36cdb932fc09c35a1c83c1582a3a9945db9ce168c0470b12eed01c1d748de892d7aedbfb2
 MISC metadata.xml 345 BLAKE2B e790a1276e74a87344d475c26e041546981c9d72b52c87f4a059d455db310fa4bcf6423d46e44971fe0776cc3ef52163235d6ebf7dca68aae20d2339c1e946fb SHA512 d8286400b18dfe0d38bd49478c84c5d7bebb24a734a74cbdf60a9e91c51f4ecafa476868351a7f09c064887da841f79e0449910df1f3b2a49f460d74cbebccb6
diff --git a/media-sound/fapg/fapg-0.43.ebuild b/media-sound/fapg/fapg-0.43.ebuild
new file mode 100644
index 000000000000..e50690223847
--- /dev/null
+++ b/media-sound/fapg/fapg-0.43.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast Audio Playlist Generator"
+HOMEPAGE="http://royale.zerezo.com/fapg/"
+SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="xspf"
+
+DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf=""
+	use xspf || myconf="${myconf} --disable-xspf"
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 15567fb45b5b..78eeec141987 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,5 +1,5 @@
 AUX flacon-5.5.1-ninja-warning.patch 2227 BLAKE2B 07957a0d79d3c6d8c228ba00f1232c5e2071f6868097ff891ee00473ade0f01f32ec8a9ea8fdf55ea7681d82e9c023382dcf978d828a7a0c0a2b05053b36d070 SHA512 77755301347b562f1f0003d13cd933f98e3bd9041ec9e1f8c6d4daf6e4185197cbec7f7c9ee584ef3948594c98eba13ddc509350f3329c5753430d12090b1d31
 AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed091718c809fa224d53d4cc0e15ae1f65e11d8698a5434bd3099bae3932b4931a7624ce9c00334e8503c2131a0d61d075642dc730 SHA512 a975329808a5642d4684d03c9261073633f394d789ac5b28dd30e0028a7ee8503a447644d5911a1bcd24c89fbab6279e3228dc21462f277aec9ef040b784703f
 DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
-EBUILD flacon-5.5.1.ebuild 2050 BLAKE2B 3403b621a82664dd487783edbfac68ddabd7c384945a9e26b69c8d4e0f5e850e482e1eed987e18ec31e8ac6092cc47e0c196898cb6dd4bbc907579b5be1f66e0 SHA512 0266749b70144177198643a5444a4f7351ee47cb42e813dbd649a21a2b7b301c8876ca9403120118f73036159a81b9eb4ec49c3b6bc61649194d81d6e9056b01
+EBUILD flacon-5.5.1.ebuild 2054 BLAKE2B ef3d11a1597614da229233d9d4e4a1392d30c2256595da59ae3aeaff3b778dda71647b82bf959fec2ae254936fcb469387756be4089efec98c59a98cdc14a0ed SHA512 600151bd572a377631447c31d3b765b9ad12ff1c5b3d8951c232f2563a24183f2b3b45e3213d004bb7a763e36dc69136bc99655f595f6f818c7dde2a7cd80087
 MISC metadata.xml 245 BLAKE2B d65195b37ab70bec146facd788d5a6239a7795c578130cb5703bf89e7a92da8acf8f4840e7f867d61359b57f0b002396a9e959cb9d2bbee2654003bc8ee061ff SHA512 be2b5dde02a39ab7345c9918796ce93c2356899fed6beb96b43f93b81eeb96a74020d2e606a5a33f95dfafa1bdef23620ab3214c2744c5e418beb7e8df1e9ae1
diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild
index 96d89a0965ea..30810280078e 100644
--- a/media-sound/flacon/flacon-5.5.1.ebuild
+++ b/media-sound/flacon/flacon-5.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # Tests require lots of disk space
 CHECKREQS_DISK_BUILD=10G
-inherit check-reqs cmake eutils virtualx xdg-utils
+inherit check-reqs cmake optfeature virtualx xdg-utils
 
 DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
 HOMEPAGE="https://flacon.github.io/"
diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest
index 842b06ccede4..956119bc4345 100644
--- a/media-sound/gimmix/Manifest
+++ b/media-sound/gimmix/Manifest
@@ -3,5 +3,5 @@ AUX gimmix-0.5.7.2-QA-desktop-file.patch 231 BLAKE2B 62bb0bd4df813f3f438383ff1e2
 AUX gimmix-0.5.7.2-fno-common.patch 368 BLAKE2B 6e6729946326f1eece90dca1ab147c0f44ffc0effabb0ede4e1c964542ab769f7223d82a20f71abd0d92f03c0308ad7bc242348833fba69ded96e385bfaeb31d SHA512 0aeb4d06b5efe63cee3cc687ffdb78d988a9eb044aba881b283f1dc3b76f84dfbcd7f223bc1b59b827e06f4748fd1a03420230b20ce55e4bf8d6ba13a84b2398
 AUX gimmix-0.5.7.2-format-security.patch 285 BLAKE2B 4399e9fc6b570ecaa11443dddf7605644ce98cf67f5649ad89384dd1d763b20e2e345ca50ef9405b49fef2f55affa983aa854abff699487f6fa319d64511836d SHA512 a5dcc28dfd454377eaae36ff904260b942dd1174c8af55f63739a9565efdd03b4e848ac297b45d5de167cd51e737e8cb5034178c9831d8b8f120af0b59cc82af
 DIST gimmix-0.5.7.2.tar.bz2 497249 BLAKE2B 06397e0bb13d8844c033bf1f17c7014be67783bb3b690bed387c84a7ddb6b58bb54ecdb45bcb57667a3d93947810b0e6797866ff1bb9f4b38a83574088ee826c SHA512 1e2df9bb4ad8286d6a03d6ab41a231f1a994df5eb4e0190ace83bc5683c69c9a6ff8fae1da473be2c0c050461c9a24e2fc1e111027ea7ce21a7c12472a761b21
-EBUILD gimmix-0.5.7.2-r1.ebuild 1003 BLAKE2B a0d7b6db2e931f09e17c450751016a9babcc5a13e747e332ff28cc8485c9a3cfa3d91342d6414c507a1476355ca796e8c6ffad85aca7c1ed2f2d5ddd39b94dfa SHA512 59e11347e1692aa0dabad6395f15e2ca6d172c9134fa3e57b4e5536ef629603705d1667542ccdb8a1531bd25fc818bbdf55be5f094f62b27059fd9ad6cce1e7f
+EBUILD gimmix-0.5.7.2-r1.ebuild 1007 BLAKE2B f7f1283802298d493060c706cf5256f7614af65a40c8056215cff80a7cf8e50ab55a90ad9572b65248576bbbb2fa4d2aff9cf3b19a6d7ba138c08cb25b462a63 SHA512 0d76f1048d4be44c42adc92e50ec9eb2b4e18d96abab254d06d12fae74046955a5b6716b98ff1d7386e379048ae9ff193c19ec38da06f84a9ac7376bd07d5ba6
 MISC metadata.xml 447 BLAKE2B e925d9268e0b7dfbd8592fcd83f5ff2f7ab86eafd625831592c14b1772f343bfb8d1eab4f711e2b1090c053e92e968e9f35bc6ecab046fb2f2df148129b1b0f0 SHA512 f186c67facf87d3e06be7d5bd5b42bf144a5cc6e9f3826d870dc11814a0547ccc366a87610f92966e6c8858d7987d450dc07a89ada961212d3f05aaeade14c57
diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
index 94b5fc0b68b1..28d4cac40336 100644
--- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
 HOMEPAGE="https://launchpad.net/gimmix"
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index ab1a29deac80..1fc0a0fa7410 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,8 +1,9 @@
+AUX gmorgan-0.79-clang.patch 519 BLAKE2B dbe18a3592fdcc0b2ec546f4bb36b2ed281c048c1eafce72c8206313def848d6eca2b67b4eac61e0f0ada0ca2799a9b05677bba294a19e4d6e95837ac7ee84f4 SHA512 27b9466083e97fa2db05b47d2dc56b24310bfbb6af3424ea2afcdd282c9652a64c2d538521c53727b95dcdadaf5b436b846ecd3f7c66fc83e7ef3b1d20b5da3b
 AUX gmorgan-0.79-gcc6.patch 1903 BLAKE2B 513f0f7e0097d2f6c3352557ca01afb0df0020d0c331defc0c1c7c3395f188f44a03c4e8198a23f7d826e449ae78605f33c6c063c8fd9d79be3da25d34dc2816 SHA512 64fe047175335d9c09de0e4a6ad9294e767500d1dd1835db1c1e434c91b28cf920d8cd7789af3c4aa92b90b9ac87e777184dbf7705872028b7a19a9ff4822eb7
 AUX gmorgan-0.79-manpages.patch 1199 BLAKE2B 6989a057f92e75e5dc607e3483408446423b58939ca4ae883b539cc706f0e64e547224eb5cfff95c1c4498ae673ceeef13b29e5692c0aeeb339dbc9bfc745eef SHA512 0841c0e281374489682f7c585c84ae879348d0703199216e53a4a3babecd44d6d735318c24a1c72034c21f53272a79b0c26a628660783336515095b3c5c81895
 AUX gmorgan-0.79-remove-dirs.patch 760 BLAKE2B 34b638a52d737ecc87219d59560449da339d5467ca6a1ba31551036610ff3fc62a7466ee33db6c073aaecc5e58646227a4e64f2c54044c44ac91ec96fde55148 SHA512 23300349241ea9dfa0b8a6ad9504a51c15ecf2a3dd23baed5a163888f9bb0208e96d728a41ad5f5388b6ffa5d4e691b7a7b6f92cd7f6a140d840393a473a231f
 AUX gmorgan-0.79-remove-gettext-version-check.patch 855 BLAKE2B d1bbce53fe0b17682fe1f08bc5eeca04d909a52dd26f1033aad37a3437436bd6f7b7cf630ffd4b2c74b92ea5d9a19d4f5d168d2202286320ac55613b88989551 SHA512 1119f8a6aaa20d81d6138f912fa13caaa4593519389094963503c0974a97f8b35d65ce0ad54d66efcc862ce092bca4e1f141fa5e62f0e4b579bbeabe535d6ab4
 AUX gmorgan-0.79-remove-old-docs.patch 736 BLAKE2B 584fe41e8f2c227fed77da87699b799090a52415a1acf193446462cac103475a8fe58edc1837b15febba8fb0119991548562268329582743f79db48b6181994e SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108
 DIST gmorgan-0.79.tar.gz 8055701 BLAKE2B d847fdf668e46b3e9c0a5d8b81b7680fac4c4d0236ab07fb2ffb1e093938dc2f8856ce384252841a31a531f285c85375c80ba7b4989b134028c4f92f6b706d0f SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0
-EBUILD gmorgan-0.79-r1.ebuild 859 BLAKE2B 3a2b5b3fd35384c6856daf9a65031123bd189dbc3afe654ec6390841b0d8aa00feb674218890c2dcadf80dab5c3b77c922de45ecf2f97c86c7a0f204418e4aed SHA512 232d5250ac1b88594f116bfdc6a9da1cfc991693dc26c3bf19109cdbaee70a54c67e182defffae58a16e98bb753c8f97d33832053786934066c07d87e7a263db
+EBUILD gmorgan-0.79-r1.ebuild 888 BLAKE2B fae3b382af19b7ab0dab98255430b671cec1f34e674a175ff6c6cae180386dde938fcdff6b3ce7c447ac07e090be9a3eda4cbecd08b20c31f838e126c8791329 SHA512 c7cf4ff4d6513fc2c14294c34b70853b16f5495d49722153473dbdd77ac73d646b2f0f240668449627f956b238293a525d844e2d3d3401fceef99c346cdf085e
 MISC metadata.xml 336 BLAKE2B 2d754b8db2a3d7f4f6c1c30393e407bdd60a1ee1a4b555b18bb12707369ad151d906ffbf3e3ebcaa816e119ccfddc682ce227f0685702fa647a4c6d25495de8a SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang.patch
new file mode 100644
index 000000000000..fe687dad3c1f
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/src/NotGenerated.cxx b/src/NotGenerated.cxx
+index c2d6425..d7c6910 100644
+--- a/src/NotGenerated.cxx
++++ b/src/NotGenerated.cxx
+@@ -16139,7 +16139,7 @@ GMORGAN::cb_BPSave (Fl_Menu_ * o, void *v)
+ void GMORGAN::cb_BPPrint_i(Fl_Menu_*, void*) {
+   char *filename;
+ #define EXT ".ly"
+-filename=fl_file_chooser(gettext("Print Song:"),"(*"EXT")",NULL,0);
++filename=fl_file_chooser(gettext("Print Song:"),"(*" EXT ")",NULL,0);
+ if (filename==NULL) return;
+ filename=fl_filename_setext(filename,EXT);
+ #undef EXT
diff --git a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
index 1aaebf4e3107..54db2b24697d 100644
--- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-remove-dirs.patch
 	"${FILESDIR}"/${P}-remove-old-docs.patch
 	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index 0e4376ad1f6b..20cc15cc2ebe 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,4 +1,4 @@
 AUX gnomad-2.9.6-fno-common.patch 1621 BLAKE2B 7e5cffd644026bca5fe84090930535e2129be9135c1e5e97e5e4f92132026cc210321da7e0e300655c14906559888e15e4a1a13598b32831cfeeb262c199706c SHA512 97d9e3d08808a81c206ffa39bc914bc152fde781ede811ecdde3ab2257442466f4f5f792dfec6d65b9e78ed66cb07574bb036ece8895f68097e7f518b5060288
 DIST gnomad2-2.9.6.tar.gz 318431 BLAKE2B 756345c1b27da5f41d46aaf2862d94a2a94cc91fece77eb5cd8428581773867a85e120e09e83337ddbf8d77a91bd7db09d50584190d9929be45bb3d94393b9eb SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1
-EBUILD gnomad-2.9.6.ebuild 833 BLAKE2B ce3d5e0bbf90b609d205bf0f111aee40fa2b88b6d30c232c56eefc83bd01150317f2f717f6470d78d2a8e9ad73d8e873659a4a0bee7fa8ffef9d4a6d5118778c SHA512 6441b7db366561bcd679a66e07004d1deec8e4460616a79c89ffd22de1952d2397510c13e78046b54daa1c6ba1c99cfc0a46368bbf86d3b91b9fb25ce90864fc
+EBUILD gnomad-2.9.6.ebuild 846 BLAKE2B 6ee008f483276fde5f999f4e9bce88e8bc2435ad5c57012ef4498ffc979fc8d452babd2a5afb573f75694fee102bb21ec72ee5718f84ebfdb737afa0ac92a5fc SHA512 6d0afd0213c2e3bfc14bf0a73c69a8be6ae5440daed934716a738a9e60e8ce8954f5350ac3c69c70d2a3b55606999f3c96f0f587ecb12c18e3e5b911ffac39c8
 MISC metadata.xml 330 BLAKE2B da9e23c768fba646f72a220e5d3d24a78d8e021660f7310bc657df6fc2ef56a6b4419149b0d2463b9ea51ae5c70795d79c23a54ef4c8fac25b1a0d41212120f4 SHA512 c039363dc7f06ccc5d9652d41923ea06819f199758fa843adad78a11dc00d230b49ebe5141c16f0aa6bf92909021a859e5be187d918eaa0f93fe7f2be7725386
diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6.ebuild
index 45206c12519c..5c0417d87c23 100644
--- a/media-sound/gnomad/gnomad-2.9.6.ebuild
+++ b/media-sound/gnomad/gnomad-2.9.6.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit xdg
+
 MY_PN=${PN}2
 MY_P=${MY_PN}-${PV}
 
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index 9c236d14c767..4813d0edd5d6 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,4 +1,4 @@
 AUX gogglesmm-1.2.1-use-fox-1.7.67.patch 5107 BLAKE2B 3f2099cb4839b4b8c7807c34f1d80508426890fd80fa88160fdea7842846dd18af21aeeffe50bc4d1adb8f223ec14b8790150c319855e5173691a05e6343da7a SHA512 270cd9c28ca026196025b57791ff3d77bb93ff0650e643cdca8f2b19e81a3dcb05248b5ca1dbf33a641663caccb1c0ee3633b8cc8cb6d7ec7a55e2a2da8d6c34
 DIST gogglesmm-1.2.1.tar.gz 3015072 BLAKE2B 6a33ba6b678bc23e449898e4f492064301ca9c37239d713fa5ccb857d51bb4c4cf5dc1d4576f2f6dc745eaff607f4400e5600f45c4cbdde8c43cee5ca1fc34f4 SHA512 c165ddde463afcf863b74f00dfa1566077007f51617fa00a95dfcdeeab49da9ee87406f6bdc7779c597002d1e587886c7992e9e892ce4988f3bb14f015336547
-EBUILD gogglesmm-1.2.1-r1.ebuild 1099 BLAKE2B 581bd73cf3fcb83e0f21e19b40f93e9c414db9743f9b917acef7bd52909b046a74b657fa6108f4b00111c1f83f0b9f8fbc7be5e079e465abbb277f5b8f6f6da0 SHA512 affa38da15bd48dc39f7b83a0fca55e57386a8074c1f0de81581f74c8a917650222657f404abc4e9a49c2b83faa6d40ef77744f8a0d57a66b76659fe573b2dd7
+EBUILD gogglesmm-1.2.1-r1.ebuild 1141 BLAKE2B a3da633850f279d4c90e0eb20cfcf47c179fe85af8cdbe9fbd9e95bc316d2e56822302604b22e356e503af3d1a224bb86d09962da0707d4178f248784b77632e SHA512 e854867c87fd1211d4d60222b8eddf4cd5cdef02bd820e5335355fa646c54b4af5d2bc0f57827bfc352bcee85fb401e2248565e5fbab8c6be2b1c4dd49f3ff1d
 MISC metadata.xml 448 BLAKE2B 4a31050a18310ba35f5357159e9ada1671feda06dc71635617acf8825073a3a822aa95a3d3110545ff9ccdd809d317ab45000f5aaab5d8f52a8dad0c6133a03a SHA512 349f8b931b5a24ea7b588f63f67b38ac00e752491031cf434802719bd4d4d62aa5c7d277cf5e6a3dee72c570c121606b6a108e080262b1070de538c384552858
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
index de8b8d6c52df..e5b64d9f6255 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="Fast and light music player"
 HOMEPAGE="https://gogglesmm.github.io"
@@ -34,6 +34,10 @@ DEPEND="dev-util/cmake ${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch )
 
+src_prepare() {
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_DBUS="$(usex dbus)"
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index ce950ab6dc4d..36bc1c39fb3a 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,8 +1,12 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
+AUX hydrogen-1.0.0-i18n-path.patch 455 BLAKE2B 099fe7bae1d7a9e5cf7eb8b7fc650f0421c91d0170b7ef3577d0b5249fa23fd71e802d8edd8ac80f9c2487473f9b7aa4a84b912d8fe8f3e4de6d2a5e418ab219 SHA512 cb96acb38f37803676be410082009ca7e0e0e6f83cbfb9d519c0f83212caa903891db12275201ab0395bde5edf1204508f81c45e9ea3e49ae33834719d277517
 AUX hydrogen-1.0.0_rc1-gnuinstalldirs.patch 1240 BLAKE2B 165cc1e6706a95c57d9ebcac7689c5725fbbe3c72eca8d0b960ade48b09b0c9e38b2750319f022075427c308cf55f5cf06f5c8203e02ecb999bc5695ff4cd0c3 SHA512 d48380e4ed620dd3e5cc508c9a90224b59b9d1b57b80fbfc42d6991bfc14ddab47c3082831bf8356f701c97fee48ff326f64a7c04becb9bb86b0a58b5d358a23
+AUX hydrogen-9999-i18n-path.patch 457 BLAKE2B dde2e8b80ca79f52c05a2512d2d07333cb118c96da92326716533c27908fd68dfb5159a8015a2e3347bb20cc7be96217bba09ec1833cdef06d4d3c2ace8d4aae SHA512 85f974df6d490650562a34dbb4dc126d6b67c85bdf1e91303967714738999a9299e64fdac3492d1b7da4bbccfb1773972888840f54327dba3b4efb0671023841
 DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.0_rc1.tar.gz 11502829 BLAKE2B 2d529c94713f415af1b183ff8dd11d05111da1cfac130eea749aaa5c5fa941bc69b172bdc77cf755ad3a34617609af28690cd94bc975feab3ecb06af6e7965f8 SHA512 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
-EBUILD hydrogen-1.0.0.ebuild 2089 BLAKE2B a14b411e83bc9794d94b96eade4d459c61514cde48cd6a5b9d984f9de20e1df6ee7b3b1a6ec3b0c86946604a41eb628257829aa86855dc8b04a50bc7d84bb47b SHA512 fd55d835c7d74498cd78e7678f0abd8e6230051e84f8fb4b4a585967febb593a8463650b742e879f43d5b36c0f0ef790ffc1c6228ae65622005d96cd7e194c24
+DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
+EBUILD hydrogen-1.0.0.ebuild 2128 BLAKE2B 11928a6b08edc2554eaf268f880242138c59d3aa8f65630285c3c829cf9045b5b0f04e1b058b14c5aae9a8544ee5c2d7acc2a292b3636046140c3b56e30ee580 SHA512 ca431970707511c68541220a97b0dd3d70946d2f2f4e6845a72674fe136e8314aad1c020bc909e27f5b96ca894bc9d6ed1830cc3303fee200812ad0bccdafeb1
 EBUILD hydrogen-1.0.0_rc1-r1.ebuild 2104 BLAKE2B 68108e4fe3b357713cc567f819634cf5a535abff1e365f6952e76218cfe5fdeb86b74e173649b306c8e209b3cfdac24c385e1babf5e163b8da16a69a2f3f04f7 SHA512 db6ebcd97acb754f004f19bb98951b0c7f5703489a6f6881fef1edea64a9230b7a25b671a7919d1e1a1d82dd8d355e9d7b04c8b55d49e38b129574a3cf508c1f
-EBUILD hydrogen-9999.ebuild 2096 BLAKE2B 9372a442451a8aee63ab861496fa820e47396ee4ee2b0b9cbfc389ed8f7930c05efbb9e7cd61a9fd672f65c6dd207a98a6ff1ed237c7ceef79ff94bf5f060173 SHA512 e37238a1baf16a6f41ee930dd9c18a0d8d918c99eaba1a7f10deb311374c679355bea9dbee356381489b3e61cb894fd46f927e0aabdea865d628c57ef539a752
+EBUILD hydrogen-1.0.1.ebuild 2096 BLAKE2B 9372a442451a8aee63ab861496fa820e47396ee4ee2b0b9cbfc389ed8f7930c05efbb9e7cd61a9fd672f65c6dd207a98a6ff1ed237c7ceef79ff94bf5f060173 SHA512 e37238a1baf16a6f41ee930dd9c18a0d8d918c99eaba1a7f10deb311374c679355bea9dbee356381489b3e61cb894fd46f927e0aabdea865d628c57ef539a752
+EBUILD hydrogen-9999.ebuild 2133 BLAKE2B 129548ab21f33bd626ea3b7235ff61471142038109998683dff4aa98884b4fbab2b71c4088297f3ec06924d98eabad62852d58ad2fedb11b49e2a0cd76bd23ee SHA512 5ab310fa51b3a856441b5c332957838aa1725b7da740781dcf56c3a8ab8a08e6760b99a4b9c70ccfa35c741dd6a9bd1fb7e955d18771c4ff2d5fd8551cf32053
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
new file mode 100644
index 000000000000..075d0d444a0c
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
@@ -0,0 +1,13 @@
+--- a/data/i18n/CMakeLists.txt	2020-09-07 08:47:15.743516826 +0200
++++ b/data/i18n/CMakeLists.txt	2020-09-07 09:03:56.084304480 +0200
+@@ -5,4 +5,9 @@
+ 
+ QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+ ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
+-INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++
++IF(MINGW)
++	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++ELSE()
++	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
++ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
new file mode 100644
index 000000000000..3c32e2b3e621
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
@@ -0,0 +1,13 @@
+--- a/data/i18n/CMakeLists.txt	2020-09-07 09:31:57.481066097 +0200
++++ b/data/i18n/CMakeLists.txt	2020-09-07 09:29:27.612763184 +0200
+@@ -5,4 +5,9 @@
+ 
+ QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+ ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
+-INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n")
++
++IF(MINGW)
++	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++ELSE()
++	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
++ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
index bfd663bbc555..624df7253667 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="http://www.hydrogen-music.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-i18n-path.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
new file mode 100644
index 000000000000..245dc874f114
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+	KEYWORDS=""
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="
+	${CDEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 245dc874f114..87e5b809fe3b 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-i18n-path.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 4556d7554732..fb7f7b6569a4 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,5 +1,5 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2172 BLAKE2B b1fb5f973f3075b0581dba658af35bdea3de09879087c418b15e21052ca13dfefff9177cc70093d1e407fc635459cf713c439414d623adcf8d69208df174a113 SHA512 f02358f11e2c658278b52cbe5b6ce018c6bc05ddc0c5265c2e0c1bd640019110189549da2a6fd03f0807157c22e0417abd463017e2ce62867db3f0954e770199
+EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2177 BLAKE2B 4491d00931c9c5fafead84e39a4c168c6c909d973956386df81e69e8c2c7240fa536293838da1cd367196378a2d07d8c8f1e902afda0849fe23fb223e1b13fdb SHA512 f36b36278ce5c6424efb9f501e10c20e73cbc728f0c7f70a38fa8d996969e880e746927db77d1eb45abe61ea883201f8499135b9355e1c4f2aa2daf7a5a0733e
 EBUILD jack-audio-connection-kit-0.125.0.ebuild 1947 BLAKE2B 54ad16c5a76b562c2a9cff2bb545463121870f2414171f0b7cd46bae55a52a4e431fed51527eace5244cabd35130964fb031916d4a5028d2965c85448ef92889 SHA512 e4407c136e6a24006cbb0ae3597493d862eccd5b60e04dcc4f0418defbd10fe3d98f687d90db33f89fbada2dbe556ae86e1d1df9a7e56d222f7dc8780eb0d5b5
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
index e50a6f8c87c0..1cc33faedb26 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jackaudio/jack1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
new file mode 100644
index 000000000000..32f481ac7044
--- /dev/null
+++ b/media-sound/jack/Manifest
@@ -0,0 +1,3 @@
+DIST jack-4.0.0_pre20200706.tar.gz 198987 BLAKE2B e45c2457c82901c5cd63f726be3a6931fdb09e9fd5cb1dbaec13951614a108f07c14f98ef7ba18f4c81a0da48d151f13e5f7250121e80c5e8b163c344ce07b15 SHA512 bcb2e629daf6b015cfcb63bb07eed37cc9a517f6581489846bc9cd236c5e9f7163765959f042cbc9a87160dead36cf023c79ce1e3207b14ff52959ed21989dc4
+EBUILD jack-4.0.0_pre20200706.ebuild 1363 BLAKE2B 7d98a8211a7a2a261fff1acc553482d4e3258ae61da29649662fb27dcd5832c6a46ff387446b64663c2d9a91755309fd765dec8367cca57729d6a80735b910ac SHA512 cecf2af3f18a2c1e4d4404bc1ec310c9ce6da0bece3024b22b26a61c8da38b325dcfa2a5aaa1a3c093ec1b55c9e11a63b6fdaeeebe03dadecec366d4c0d5abc4
+MISC metadata.xml 481 BLAKE2B 2bf3ebe03e9ab9b81437608a57cdae359c6afd2f083d19bb75a046fe0c2617e8fc7aa2d78d9ba7b190ac0f7749b71bb6498d12d95c6c62a3dd5c031d0a8af425 SHA512 da4b26c98824b1c2798f941ae95e0bcb4cdd6ef654dff4965d28b3fa8f3952a6162e028d793c9a9e9f866d74c22b3ed74cc99779efb84cd0eef5134c89dde8ac
diff --git a/media-sound/jack/jack-4.0.0_pre20200706.ebuild b/media-sound/jack/jack-4.0.0_pre20200706.ebuild
new file mode 100644
index 000000000000..93a92e7a23d0
--- /dev/null
+++ b/media-sound/jack/jack-4.0.0_pre20200706.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
+HOMEPAGE="https://github.com/jack-cli-cd-ripper/jack http://www.home.unix-ag.org/arne/jack/"
+GIT_COMMIT_HASH="8e2004d7453f5d71d5e73032cbe7770b75bfbd41" # branch "python3-mb"
+SRC_URI="https://github.com/jack-cli-cd-ripper/jack/archive/${GIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GIT_COMMIT_HASH}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
+		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/flac
+	media-sound/cdparanoia
+	media-sound/lame"
+
+python_install_all() {
+	insinto /etc
+	newins example.etc.jackrc jackrc
+
+	newman jack.man jack.1
+
+	local DOCS=( README.md CHANGELOG.md )
+	local HTML_DOCS=( doc/*.{html,css,gif} )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "${PN} can use the following optional binaries, but currently there"
+	elog "are no gentoo ebuilds available for them:"
+	elog "  fdkaac: encode to M4A format"
+	elog "  oggenc: encode to OGG format"
+	elog "  cdda2wav / dagrab / tosha: cd ripper"
+}
diff --git a/media-sound/specimen/metadata.xml b/media-sound/jack/metadata.xml
index e85697c2a805..e89252b7a39a 100644
--- a/media-sound/specimen/metadata.xml
+++ b/media-sound/jack/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<longdescription>
-		Specimen is a midi controlled audio sampler for GNU/Linux systems. It
-		allows you to create music using various sound files, or "samples", in
-		tandem with a midi sequencer.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/jackbeat/Manifest b/media-sound/jackbeat/Manifest
deleted file mode 100644
index 82a2b360f3ea..000000000000
--- a/media-sound/jackbeat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX jackbeat-0.7.6-automagic-pulse.patch 1150 BLAKE2B 9fb95fb8d5ca67b5ceb14f3d64240ac058720560ef3d4061c089d1f0425743903f601436e1797a4e15ace8226298d2e01b1a29f0d924ca8f48dad8908c8d708b SHA512 4a3dc8d634a0cdf5162be4c2d0a2809231a83a11401a14a7aff86a6090e29674a09bc76a4ab928ef2f102b1e61f014b1d5ebbd24604396f51aecf843b7e6ecf2
-AUX jackbeat-0.7.6-underlinking.patch 691 BLAKE2B 34b9dd02ad77030d5646a7c1e3fa2cdc537cced2a0a436e6469bfb8a84eb589006670ca469e28fad6143e5fe4e414ac51d89a35a5788b12c77126953afa2ed68 SHA512 4d6ac8f6413358c15bb695a2539445bf97544a0a5628eb7be8f06e29a1cad7b77894503d1deec49ecb07814efb9a58a8cd1e06213ecaaa0927ceef5ccd8b2b8d
-DIST jackbeat-0.7.6.tar.gz 455771 BLAKE2B 0509ae815b72945313edf0db52661f65167f06c1fb3e31232f56c79595789f78669cdc453a2bebc2a408aedf569a256dc4372405f2f4e068977c6823c31673ca SHA512 878cd545cd4d53b2e3ab6e4a8b60d81a94fba22cfaab3b694046b8d47d23ca5a87eaa31a242f76449a1ee647bc20b218563261ae37f5bfe291da2e31c63124bc
-EBUILD jackbeat-0.7.6.ebuild 1085 BLAKE2B b8440c665618b97d99254c9947cd91bb9bf7f04bedb8f4acb8702decb31065cf3ded99eeae60c26e6565c665575e313e75d020621bc9d0b69b7dc31df7510ce7 SHA512 bad232a2d7bf0b88ca43cc3cd975de44b33916dcf46735f1c21fabd7b7cc7bea1b039e70f0f26d7198e48577949c8289d8f73fa2b1ab22601b897feece74b988
-MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch b/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch
deleted file mode 100644
index 5f1aca5d3a32..000000000000
--- a/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- jackbeat-0.7.6/configure.ac.orig
-+++ jackbeat-0.7.6/configure.ac
-@@ -67,20 +67,25 @@
- AC_SUBST(JACK_LIBS)
- AM_CONDITIONAL(HAVE_JACK, [test "$have_jack" = "1"])
- 
--PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.10, [have_pulse=1], true)
--AC_SUBST(PULSE_CFLAGS)
--AC_SUBST(PULSE_LIBS)
--if test "$have_pulse" = "1"
-+AC_ARG_WITH([pulse], [AS_HELP_STRING([--without-pulse], [disable PulseAudio support])], [], [with_pulse=yes])
-+
-+if test "x$with_pulse" != xno
- then
--  AC_DEFINE(HAVE_PULSE, [1], [PulseAudio support])
-+  PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.10, [have_pulse=1], true)
-+else
-+  AC_MSG_CHECKING([for PULSE])
-+  AC_MSG_RESULT([disabled])
- fi
--AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
- 
--if test "$have_pulse" = "" && test "$is_linux" = "1"
-+if test "$have_pulse" != ""
- then
--  AC_MSG_WARN([Can't find libpulse, PulseAudio will not be supported])
-+  AC_DEFINE(HAVE_PULSE, [1], [PulseAudio support])
- fi
- 
-+AC_SUBST(PULSE_CFLAGS)
-+AC_SUBST(PULSE_LIBS)
-+AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
-+
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
- 
- if test x$have_pkg_gtk = xtrue
diff --git a/media-sound/jackbeat/files/jackbeat-0.7.6-underlinking.patch b/media-sound/jackbeat/files/jackbeat-0.7.6-underlinking.patch
deleted file mode 100644
index 878929c36693..000000000000
--- a/media-sound/jackbeat/files/jackbeat-0.7.6-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/508988
-
-jackbeat-builder.o:builder.c:function gui_builder_connect_func: error: undefined reference to 'g_module_symbol'
-jackbeat-builder.o:builder.c:function gui_builder_connect_func: error: undefined reference to 'g_module_supported'
-jackbeat-builder.o:builder.c:function gui_builder_connect_func: error: undefined reference to 'g_module_open'
-
---- configure.ac
-+++ configure.ac
-@@ -86,7 +86,7 @@
- AC_SUBST(PULSE_LIBS)
- AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
- 
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
-+PKG_CHECK_MODULES(GTK, gmodule-2.0 gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
- 
- if test x$have_pkg_gtk = xtrue
- then
diff --git a/media-sound/jackbeat/jackbeat-0.7.6.ebuild b/media-sound/jackbeat/jackbeat-0.7.6.ebuild
deleted file mode 100644
index eb5ed5f99dbb..000000000000
--- a/media-sound/jackbeat/jackbeat-0.7.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="An audio sequencer for Linux"
-HOMEPAGE="http://www.samalyse.com/jackbeat/"
-SRC_URI="http://www.samalyse.com/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jack pulseaudio"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.6:2
-	gnome-base/libglade:2.0
-	>=media-libs/liblo-0.22
-	>=media-libs/libsamplerate-0.1.2
-	>=media-libs/libsndfile-1.0.15
-	media-libs/alsa-lib
-	media-libs/portaudio
-	jack? ( >=media-sound/jack-audio-connection-kit-0.101 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-automagic-pulse.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	# Don't install license file
-	sed -i -e 's:help::' pkgdata/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with jack) \
-		$(use_with pulseaudio pulse)
-}
diff --git a/media-sound/jackbeat/metadata.xml b/media-sound/jackbeat/metadata.xml
deleted file mode 100644
index f79bb67acbd9..000000000000
--- a/media-sound/jackbeat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 9074de986638..8338f0c7b263 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,6 +5,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r2.ebuild 2205 BLAKE2B f1741d6dedb2b174cef82d7f79709f5d80a958c0d4fdfd07e429a89082fc4f44af9cccd7095524059cd50d36d795c8bce145df410f01d64bff14622674f3edff SHA512 5155a795b437c9036b45d718ce26442641367d2cfb6e16a0c7805edc883d58a96b8dedf203f138ae031375239a489c4c74f88431b8c996a3755ba2f01074edb5
-EBUILD lame-3.100-r3.ebuild 2265 BLAKE2B 93d99a086eeea8e21bd119cebfcc8d92cbc0f2c7d10fa69e9cea9e1765ae0066db8b5f2c695b31d97f0bca5c2055cb1ce3dac43f3b83da03a52d72d126fb1411 SHA512 d3ee873a77ceaad1d6ccdfde8d96263bede6c17a6d539f3bec03f596ee2bec2f970a30c0a5d387dc294d4c3428acb190b22d1c4d67bc82225335782cef3e9be5
+EBUILD lame-3.100-r3.ebuild 2257 BLAKE2B 56ca48dcfb1bcd7b6a04fa400ade8a75a0dcd92822386dff71573b035da7e4ce9f26fb6fd67140aa5e30e77917e1b9a4d7dd76f562589fd583884a2cfc5c0b04 SHA512 3b2f46092145b0645235089b6755d30cf89dc2d74a83fe9a3011debf99a5d4010d4af7b3c727a9c38964141a4410e18783bd51b18a5ef93ef072820eaf46bc66
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild
deleted file mode 100644
index 1327dce92744..000000000000
--- a/media-sound/lame/lame-3.100-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
-
-# These deps are without MULTILIB_USEDEP and are correct since we only build
-# libmp3lame for multilib and these deps apply to the lame frontend executable.
-RDEPEND="
-	frontend? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		sndfile? ( >=media-libs/libsndfile-1.0.2 )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.96-ccc.patch
-	"${FILESDIR}"/${PN}-3.98-gtk-path.patch
-	"${FILESDIR}"/${PN}-3.99.5-tinfo.patch
-	"${FILESDIR}"/${PN}-3.99.5-msse.patch
-	"${FILESDIR}"/${PN}-3.100-symbols.patch #662752
-)
-
-src_prepare() {
-	default
-
-	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
-
-	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
-
-	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
-
-	mv configure.{in,ac} || die
-	AT_M4DIR=. eautoreconf
-}
-
-multilib_src_configure() {
-	# Only build the frontend for the default ABI.
-	local myconf=(
-		--disable-mp3x
-		--enable-dynamic-frontends
-		$(multilib_native_use_enable frontend)
-		$(multilib_native_use_enable mp3rtp)
-		$(multilib_native_usex sndfile '--with-fileio=sndfile' '')
-		$(use_enable debug debug norm)
-		$(use_enable static-libs static)
-		$(usex cpu_flags_x86_mmx '--enable-nasm' '') #361879
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-}
-
-multilib_src_install_all() {
-	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
-	docinto html
-	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-sound/lame/lame-3.100-r3.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index c9d3e9ec8766..d751b3e1e29a 100644
--- a/media-sound/lame/lame-3.100-r3.ebuild
+++ b/media-sound/lame/lame-3.100-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 8b40eced0599..4edd9e8577ea 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -5,5 +5,5 @@ AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
 EBUILD lash-0.5.4-r3.ebuild 2603 BLAKE2B fa39a5ae0e3cfaf3714956644a4b924d298c703bbb80f7b0e66bef1ecdc11bb71ba96138d4f14fd80ab4a6d54ac6ad9cb41ed2be81dcadd9a65e3efa39b35f0e SHA512 3bff50bcb0cb252bf992349795f8876e8c158e116426109a089312da0634704129d10ec51c456eeb3beae7834efd465b363a93c146eeee3d9aa659a5f5a791e3
-EBUILD lash-0.5.4-r4.ebuild 2609 BLAKE2B 278d8e78c576252427cfcc0c335de89bc670c3240e14e54f97b0cc9c5607d96107afc51496a82b6ea392cd67658d60b334edd477ac03b79ece5684fd4d3d8179 SHA512 7f19030014a567f04ccba189e742c3422ee40818032559394178d31f102f0eea44b30baa665f31ddba01b0ee81c09aae5dc22d48c3b78e129c6a9d5a6748a769
+EBUILD lash-0.5.4-r4.ebuild 2604 BLAKE2B 8aa4ce537296456b08fe70eb1909a6552bea4f08aea2a790557f03e08fe24fcdb85e7ff41d2e5e830f5db8f115b7a6587efd3753bc6bf456e3109e9b678adac5 SHA512 a70e90c3f14edb454bc1f2e5befb1bb20a323a2846985df5677e8a952321ed26288d43dc7e389f66485c5895ef4be05eaead5c72c6bf2f07ed204a43f8e3db4a
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r4.ebuild b/media-sound/lash/lash-0.5.4-r4.ebuild
index 3b1f8030c14b..74b77f7bd7e0 100644
--- a/media-sound/lash/lash-0.5.4-r4.ebuild
+++ b/media-sound/lash/lash-0.5.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3a0b17df2c66..a36d3e5c6b7f 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,9 @@
 AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e
 AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c
 AUX lilypond-fix-cve-2020-17353.patch 2867 BLAKE2B 135d6ccc6ed93786189b54ea77219d527e6febd59434a10b33255e2d3c21db600ea9e231d852d188a8933c6acf5f1567f48c4b7e8f905f8bc87dda1b13d8d936 SHA512 83f513a6c4999579102b592e7babc556f49a4d04f799203ff790ec211c0744a91a17700b6742c3a2044ef90c2ce52a6f768f69f376952867715315bc8096689c
-DIST lilypond-2.21.1.tar.gz 18135688 BLAKE2B 4a797c325e254b59cb314b28a801198f398efd7a37cac448b79d8161ab7248b0c9ca45ce742b82d0aebb784a98637209c84df74304a9e8c8f744b9f5033e18d2 SHA512 596f6a09d0f9a0c39ca717a9e4e246e03679a6cf40a78491eac9bc3eccf173799c75a0baef491cae8385bf1abda53244fd731695762b6fd841396edb92d0ab75
 DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860
-EBUILD lilypond-2.21.1-r1.ebuild 2915 BLAKE2B 8d74f5ee00c2720c7727e01c68fc9b1b2f26c98e1fc42e924e18dc2aa5fc85d4ddf808b55a93be3b4bdaaafa61889589b3bb0c717ece561be73e556c54532e72 SHA512 d308d5fb8916446b59ef63635e18e2ff657bfac712342910836a081f2d09c3aed8236115a39ccdfd780172d472a2fed5b94c837be3205d820fb94a0cd16c8387
-EBUILD lilypond-2.21.4-r1.ebuild 2928 BLAKE2B e304dfcaf4f267b991a5f449913fdcaa195a72dd8465ddac3865395de5fb7213b296a5b5e1c0993ca1a383cbcacd83f23f262f08c99e1239755655ad3d42ecc1 SHA512 5f76b763f9f582afbc24f3b97e1ccd26593d7dc571f08e0ca9dae71f8cad93ca7b14d1bfd2608ea349174646498583185f90bf7f59e706af4c90170c04d79145
-EBUILD lilypond-9999.ebuild 2908 BLAKE2B 4fbe34b7372cc6aa790119433519b2f9f934b7315b9601f5148598dbfafdeeca2de58b0b53afe15f80efb6ed0b24fe6ff0faf13d91e21b21815184663ef9444a SHA512 2a36d755c15731d168283dd2d4a582c479d77740d5f4596baf04b502a662e9e50e63bdf4aa6becb3e273f0b0c80b098d038723ff51e441e90eaba0d75fff34b9
+DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958
+EBUILD lilypond-2.21.4-r1.ebuild 3053 BLAKE2B f8f2f771482766d84725f1237f65a3fd7d9f83043a9458ef0f9484609fb27e0a83586956a091cfa75b31a4c567cacf60cea51a6e8052c49d2428dd08abf0f997 SHA512 0a089d91141293c8c85f839c00b7524afb1fb4cc06a78eea49faa16d3c678c904fd393eaf1aa007015f029eaed18cc71fd4ddbf34ae78436c3c8e6c6670eee3a
+EBUILD lilypond-2.21.5.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
+EBUILD lilypond-9999.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
index 0196e4c7d4d9..7d751530c323 100644
--- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.4-r1.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"
@@ -79,9 +79,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
+
 	# 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
@@ -90,9 +92,10 @@ src_configure() {
 		$(use_enable debug debugging)
 		$(use_enable profile profiling)
 	)
+
 	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
 
-	econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild
index 521872ddafbd..c03d4b781515 100644
--- a/media-sound/lilypond/lilypond-2.21.1-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.21.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -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"
@@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
+IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
+unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -29,6 +31,7 @@ BDEPEND="
 	>=sys-devel/bison-2.0
 	sys-devel/flex
 	virtual/pkgconfig
+	doc? ( app-text/texi2html )
 "
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
@@ -48,17 +51,22 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/kpathsea
 	media-gfx/fontforge[png,python]
-	sys-devel/gettext"
-
+	sys-devel/gettext
+	doc? (
+		dev-texlive/texlive-langcyrillic
+		l10n_cs? ( dev-texlive/texlive-xetex )
+		l10n_ja? ( dev-texlive/texlive-langjapanese )
+		l10n_zh? ( dev-texlive/texlive-langchinese )
+	)
+"
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-font-size.patch
-	"${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
+	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
 )
 
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
+DOCS=( DEDICATION HACKING Documentation/out/topdocs/README.txt ROADMAP )
 
 src_prepare() {
 	default
@@ -79,25 +87,28 @@ src_prepare() {
 }
 
 src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
 
 	local myeconfargs=(
 		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
 		--disable-optimising
 		--disable-pipe
 		$(use_enable debug debugging)
+		$(use_enable doc documentation)
 		$(use_enable profile profiling)
 	)
+
 	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
 
-	econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
 }
 
 src_compile() {
 	default
 
+	use doc && emake LANGS="${L10N}" doc info
+
 	if use emacs ; then
 		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
 			|| die "elisp-compile failed"
@@ -107,6 +118,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
+	use doc && emake DESTDIR="${D}" install-doc
+
 	# remove elisp files since they are in the wrong directory
 	rm -r "${ED}"/usr/share/emacs || die
 
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index fc14ef8ed34b..c03d4b781515 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -20,7 +20,9 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
+IUSE="debug doc emacs guile2 profile vim-syntax ${LANG_USE}"
+unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -29,6 +31,7 @@ BDEPEND="
 	>=sys-devel/bison-2.0
 	sys-devel/flex
 	virtual/pkgconfig
+	doc? ( app-text/texi2html )
 "
 RDEPEND=">=app-text/ghostscript-gpl-8.15
 	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
@@ -48,8 +51,14 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/kpathsea
 	media-gfx/fontforge[png,python]
-	sys-devel/gettext"
-
+	sys-devel/gettext
+	doc? (
+		dev-texlive/texlive-langcyrillic
+		l10n_cs? ( dev-texlive/texlive-xetex )
+		l10n_ja? ( dev-texlive/texlive-langjapanese )
+		l10n_zh? ( dev-texlive/texlive-langchinese )
+	)
+"
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
@@ -78,25 +87,28 @@ src_prepare() {
 }
 
 src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
 
 	local myeconfargs=(
 		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
 		--disable-optimising
 		--disable-pipe
 		$(use_enable debug debugging)
+		$(use_enable doc documentation)
 		$(use_enable profile profiling)
 	)
+
 	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
 
-	econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
 }
 
 src_compile() {
 	default
 
+	use doc && emake LANGS="${L10N}" doc info
+
 	if use emacs ; then
 		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
 			|| die "elisp-compile failed"
@@ -106,6 +118,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
 
+	use doc && emake DESTDIR="${D}" install-doc
+
 	# remove elisp files since they are in the wrong directory
 	rm -r "${ED}"/usr/share/emacs || die
 
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 008a813a8500..e815e684874b 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,8 +1,9 @@
 AUX milkytracker-1.02.00-CVE-2019-14464.patch 926 BLAKE2B 632af971c55cd80d1a8aa2b8d2dd2fdc5c471feaa0bbe8fff0b980de8a1db2f2281a816381a08a064f105146839fa63194e770190ca77ec79a14d9c2ff1839b0 SHA512 c37d11fd83831199075205ae9631bb6a2ac05458c63155a8a65a093fa8ce851ce7b9d8efb35d7db785760dc126c225aa292c4b11f3de5d2f87d7fa9c0bda6c76
 AUX milkytracker-1.02.00-CVE-2019-1449x.patch 3121 BLAKE2B 8b863ed8a9c78942c303e06ed8f8089d4602a9b8765a38ae9974f3871441f9b10cde4cc8a297a45cd66da567c94234c4ca9f7eed1505ba2ced92fb2407cf5fed SHA512 4805e831e6ae3934fdab2045e76eb1bfd750e3efb4df58b374ac69d7bdc6d5f88241b4a8d87a6b681cfdf11c1b0316f7c6691d505b6cfd28dd6324dc0de7bff8
 AUX milkytracker-1.02.00-CVE-2020-15569.patch 972 BLAKE2B 34dfbe0690fefce4cbcfeabe571d811092bba6c72e2bfe8db5e087d21774563bd79108e88c66b490999553587ab755fce16d53f4822e23149b86c5585aa46c00 SHA512 358b5e1709a634f2e51c6bda53684c903f57e328d73a364c5b7feac4c278288838cfde3f1afc087b2f52259f1cbcacda022dc92f3a621c7d772a9be8d248c220
+AUX milkytracker-1.02.00-clang.patch 2346 BLAKE2B 4e957fbc69e4b5aa9ee5f93292df62e04f577e26dbc2b16464c338761330a95247a5f908d471f000964c8960878d673293f71ddb6289bf386923cebbdbc335c1 SHA512 3dcac9b8d889f761e016f7fedfb2670392982f74438bf4ed83bbdfb89f424f583ea9c16ac13c3c9a99e3453e9ed6f460866563fde3318eaba49218181fa1ebf0
 AUX milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch 2570 BLAKE2B fe0a454e34c9b7b88125ccdfb6f77e1cc014013a8f054f00c6330e733ba54154bc1d96ef256cf5befc8329c169e57f29062652f0ff84dc55201572d0201111fc SHA512 0112a805d61204ff31ad0b1b31cbc9ff60f91f5ada275a839f0c258c3f5302239fd9b00ba7d8387b5865ad2ea86abedc32630ff2f1b58c0a74bfa67895a5676a
 DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
 DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
-EBUILD milkytracker-1.02.00-r1.ebuild 1497 BLAKE2B 76e41340629253f19ba1253f3a662ced5af0ad03c0eec158a48120d7b557b96bca64a19dbac13e8a44f8f0b8e5135c20c7134f9168e67ed01bc639512867b113 SHA512 d8da48058c5fb7eb1ef9f95ccb7855fdadf50ed5415af38175d0fe08689c101e110a57685cbcbd814530bf75d05773adebd3195d192163e496aca4b1d9dd148e
+EBUILD milkytracker-1.02.00-r1.ebuild 1529 BLAKE2B e54c9fa967fc74dc2c8469d48d5df7f044744cb3eacca21422165946838e1ee83fe05352390259c5dcaf63d6c35f8055c286cdfffb0151b8d59f17d8d118c56c SHA512 5008cf27c9c897d6a938af45283c08c7bcef875490ba5131828c69eb5393f3d60bbd23ff756ce78604e2ea26a1011206ce774c22393eac5229e2f4e9b2e34bd1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
new file mode 100644
index 000000000000..48e6dc39cb5a
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.02.00-clang.patch
@@ -0,0 +1,85 @@
+diff --git a/src/tracker/EQConstants.cpp b/src/tracker/EQConstants.cpp
+index ffbf6ea..fa6fdce 100644
+--- a/src/tracker/EQConstants.cpp
++++ b/src/tracker/EQConstants.cpp
+@@ -27,9 +27,9 @@
+ 
+ const float EQConstants::EQ3bands[3] = 
+ {
+-	p(5),  // 32     Hz
+-	p(9),  // 522    Hz
+-	p(12), // 4181.5 Hz
++	(float) p(5),  // 32     Hz
++	(float) p(9),  // 522    Hz
++	(float) p(12), // 4181.5 Hz
+ };
+ 
+ const float EQConstants::EQ3bandwidths[3] = 
+@@ -41,28 +41,28 @@ const float EQConstants::EQ3bandwidths[3] =
+ 
+ const float EQConstants::EQ10bands[10] = 
+ {
+-	p(3),  // 8      Hz
+-	p(4),  // 16     Hz
+-	p(5),  // 32     Hz
+-	p(6),  // 65     Hz
+-	p(7),  // 130    Hz
+-	p(8),  // 261    Hz
+-	p(9),  // 522    Hz
+-	p(10), // 1     kHz
+-	p(11), // 2     kHz
+-	p(12), // 4181.5 Hz
++	(float) p(3),  // 8      Hz
++	(float) p(4),  // 16     Hz
++	(float) p(5),  // 32     Hz
++	(float) p(6),  // 65     Hz
++	(float) p(7),  // 130    Hz
++	(float) p(8),  // 261    Hz
++	(float) p(9),  // 522    Hz
++	(float) p(10), // 1     kHz
++	(float) p(11), // 2     kHz
++	(float) p(12), // 4181.5 Hz
+ };
+ 
+ const float EQConstants::EQ10bandwidths[10] = 
+ {
+ 	16,
+-	p(3)*1.5f,
+-	p(4)*1.5f,
+-	p(5)*1.5f,
+-	p(6)*1.5f,
+-	p(7)*1.5f,
+-	p(8)*1.0f,
+-	p(9)*1.0f,
++	(float) p(3)*1.5f,
++	(float) p(4)*1.5f,
++	(float) p(5)*1.5f,
++	(float) p(6)*1.5f,
++	(float) p(7)*1.5f,
++	(float) p(8)*1.0f,
++	(float) p(9)*1.0f,
+ 	600.0f,
+ 	800.0f
+ };
+diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
+index 420b4d9..d404f08 100644
+--- a/src/tracker/sdl/SDL_Main.cpp
++++ b/src/tracker/sdl/SDL_Main.cpp
+@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Event& event)
+ 	printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym);
+ #endif
+ 
+-	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
+ 
+ 	PPEvent myEvent(eKeyDown, &chr, sizeof(chr));
+ 	RaiseEventSerialized(&myEvent);
+@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event& event)
+ 
+ 	preTranslateKey(keysym);
+ 
+-	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++	pp_uint16 chr[3] = {(pp_uint16) toVK(keysym), (pp_uint16) toSC(keysym), (pp_uint16) keysym.sym};
+ 
+ 	PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
+ 	RaiseEventSerialized(&myEvent);
diff --git a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
index b27c6c5260b4..b86251123c51 100644
--- a/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.02.00-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-CVE-2019-1449x.patch"
 	"${FILESDIR}/${P}-CVE-2020-15569.patch"
 	"${FILESDIR}/${P}-fix-hard-dependency-on-rtmidi.patch"
+	"${FILESDIR}/${P}-clang.patch"
 )
 
 S="${WORKDIR}/MilkyTracker-${PV}"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 3ddd11034bfd..be646476fa98 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,6 +2,5 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667
-EBUILD moc-2.6_alpha3-r1.ebuild 2279 BLAKE2B e82260010c115fbbb05d81c3f26da8fd7b1854af7533da00ccfc296b65ac41345671176b65eab3ea75c3c4bb5fe7fbe4c38abec0e551995ccc1c3c314adcc705 SHA512 cd106235b1017286763f06e0623cc339dce44e10002d5266d15ab4eecc90874be673de805038739a761df396af3fc8b1daf8685e36bc0543df6c00b628b361b4
-EBUILD moc-2.6_alpha3-r2.ebuild 2249 BLAKE2B a6f62fe128a2a6f998a58041d5d18abf7773e04a98bdc9058af98a69e18dd9e35c22b7c9091d6b5dbce3007e591324d2ad41c2eac369c0aba5860ac8c06570e6 SHA512 c97f737542949166ce6b31e0dbcde5a6f613b0b16b5158353d2306cbd3671490ec72c21d2c132c2fcbe48d066ec8518cd4fb60c1a9b7f36dc8a0ee1753e01e3d
+EBUILD moc-2.6_alpha3-r2.ebuild 2248 BLAKE2B e74e11a9a71a95399bb7e4c802d14b3992a63a8a1c9a5386fe857fa2cc48b61c1851d41aae5c438cf7c65d8a54e2213c243953849220a61607b304580db50eba SHA512 bf4131162002fc37857ea0022f7304ef7d6f7bda45cd8ed96a1fd3d204ddbe0b1f4b3cb6a544a9661fe915d6144c07586812e9cc8926747c85148b97505b48b9
 MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57
diff --git a/media-sound/moc/moc-2.6_alpha3-r1.ebuild b/media-sound/moc/moc-2.6_alpha3-r1.ebuild
deleted file mode 100644
index 1b9556070eea..000000000000
--- a/media-sound/moc/moc-2.6_alpha3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="https://moc.daper.net"
-SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
-	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
-
-RDEPEND="
-	>=dev-libs/libltdl-2:0
-	dev-libs/popt
-	sys-libs/ncurses:0=[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	cache? ( >=sys-libs/db-4.1:= )
-	curl? ( >=net-misc/curl-7.15.1 )
-	ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.4 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
-	mad? (
-		media-libs/libmad
-		sys-libs/zlib
-		media-libs/libid3tag
-	)
-	magic? ( sys-apps/file )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	musepack? (
-		media-sound/musepack-tools
-		>=media-libs/taglib-1.5
-	)
-	sid? ( >=media-libs/libsidplay-2.1.1 )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	speex? ( >=media-libs/speex-1.0.0 )
-	timidity? (
-		>=media-libs/libtimidity-0.1.0
-		media-sound/timidity++
-	)
-	vorbis? (
-		>=media-libs/libogg-1.0
-		tremor? ( media-libs/tremor )
-		!tremor? ( >=media-libs/libvorbis-1.0 )
-	)
-	wavpack? ( >=media-sound/wavpack-4.31 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
-
-src_configure() {
-	local myconf=(
-		--without-rcc
-		$(use_enable debug)
-		$(use_enable cache)
-		$(use_with oss)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with magic)
-		$(use_with unicode ncursesw)
-		$(use_with libsamplerate samplerate)
-		$(use_with aac)
-		$(use_with ffmpeg)
-		$(use_with flac)
-		$(use_with modplug)
-		$(use_with mad mp3)
-		$(use_with musepack)
-		$(use_with sid sidplay2)
-		$(use_with sndfile)
-		$(use_with speex)
-		$(use_with timidity)
-		$(use_with vorbis vorbis $(usex tremor tremor ""))
-		$(use_with wavpack)
-		$(use_with curl)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/moc/moc-2.6_alpha3-r2.ebuild b/media-sound/moc/moc-2.6_alpha3-r2.ebuild
index ebe2775e4468..649ff0ddc2ed 100644
--- a/media-sound/moc/moc-2.6_alpha3-r2.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index e33e4469aff1..6d29caaa926c 100644
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -1,4 +1,4 @@
 AUX mp3splt-gtk-0.9.2-fno-common.patch 274 BLAKE2B 2a2368bab0d06b3c347bdce2a7c19a4b1707f405716dfa7c603b65ad085a001ecd29727c4ff8ca5c4c21c2371cab5b377a106a60f396850128d753f76d6a43d1 SHA512 b9f96afc59238a2824f3d79503acccb09ed45b2ad7527df665c0274a59a2779855274c91e2ce4e4b3cc5d4dce749a634049380acc37f827e4f4b1cf34d539f8d
 DIST mp3splt-gtk-0.9.2.tar.gz 1070580 BLAKE2B b49a246eeb03d11ec8d4c8968323c62e200439af5d2cb52321442365615b20444908f4c33e6bddeec4051fc320f303b98a1d341bc834ec768bc4d803d2fb5be8 SHA512 e837cbc0759cd6535fc466099a170d066ab72b4854f8546f524261fe660887f5d2add60d9fa1e19d68d811004c682a324b5bcba86aa8cb89ae1ad2bc2f9b1d9d
-EBUILD mp3splt-gtk-0.9.2-r1.ebuild 995 BLAKE2B 390cd2ef5aa692abd5ba8bcd961a4c653498133ea0e6d4b09a11a47d33b2f3d2c0ee5205aee339ef489e7cf3fcf2e92bd0ad1ac1b46c35e2b282c3bda129c860 SHA512 6a657d68a32d0614b6478802fbb6f10c4d5a61827f9e416659187f433c70b495d818cda99047dc9c66fe4d3f4816276fd3f5634ce781e10aa196aa6cbc369503
+EBUILD mp3splt-gtk-0.9.2-r1.ebuild 999 BLAKE2B b060af5f2fd7df4bf2e44e65505bd4846a786258afdc5fccd18f6503aa047de950ebacb3cc9612915b07b59abcb70712c8615e7d5795399085a89382c54f2868 SHA512 4ea93863daabb682b6e731df1624dd75952dd9f132720e93eae2cf74f5760f0dc88bed05226c4d8c8cd0d444e2152667f0a120ac5d83e41440ef2ab3a43f5070
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
index 9355f8230680..0e4839d68d47 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="A GTK+ based utility to split mp3 and ogg files without decoding"
 HOMEPAGE="http://mp3splt.sourceforge.net"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 2252076dbf01..bff6664e2cd2 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -3,4 +3,4 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
 EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
 EBUILD mumble-9999.ebuild 3791 BLAKE2B 8c2fa233598fbddf33686117cedea1d146cac6752320c07ab07ded9098ab99a0c4691f8cc2564ef8b8b1349ef7ce0af4840d87d15f37301aff1e2366b68f99e4 SHA512 c5edbd19160921df5671c305200b153fef8d629086b2f3d3df4b3d3e207a0f2f557d7d6e976e7f39be4f01224c75055e6a3899a2752671a2153b7c51fb8bf75e
-MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
+MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 760004df57f7..06725553903a 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -5,9 +5,6 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<longdescription lang="en">
-Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
-	</longdescription>
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
 		<flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 2399f1fac02f..5cdc87a47306 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -7,4 +7,4 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
-MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
+MISC metadata.xml 435 BLAKE2B 6628c9f2a8a849eea9d7a987a5226835529032a1b7acd443efb9f5f5f46249da602939f8cb5291ce596856ff7258be09665886a24937eb1425c05efea0d7313f SHA512 ea4d122a1a40ff30ea188254cd241f62fa1e47d873089491088228680e336ca47d5ee5941aa53e47976dd8979554f496df75bbb7688b99f26112ef27d004e85d
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
index c0b4be832f31..2299d0735ea9 100644
--- a/media-sound/murmur/metadata.xml
+++ b/media-sound/murmur/metadata.xml
@@ -5,9 +5,6 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<longdescription lang="en">
-Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
-	</longdescription>
 	<use>
 		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
 	</use>
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index a7c8b020eb87..6adab12b1aaf 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,11 +2,8 @@ AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8
 AUX musescore-3.5-lambda-capture-this.patch 562 BLAKE2B 4443f04bc90e01dbca81cac5d73a1683ecdcb1103e1ab72796a53a56f6a1b15347875374a73853d5dde62e5b6e145ca2f8c8d61c30667f9397a2baba99b4f0d7 SHA512 3ee07a796f605e03fd1c8dda6dcf2d28f3f0344a77764f032195e3f17fb366c5aefa464b49858e5a07065ca74b9444aaf2222255c7eafdb7d6536d6dd51952b0
 AUX musescore-3.5-remove-duplicite-declaration.patch 245 BLAKE2B 5d42790b4c1147a34bc75bdd46f3b3832007734702d1be5f81dc41537347574e5f0955a141f9d412ce00f95370717bcb31d272b0625e7462ce3f640e69d71ac6 SHA512 7f3cc05a05c208dedd18094639534131ffbde748da653e309c21fcc414d005ad744de82186cd7484a46cb230d08e643f52555d6fe371c237686b58a559947cda
 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_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
 DIST musescore-3.5.tar.gz 66798006 BLAKE2B dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907 SHA512 db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96
-EBUILD musescore-3.4.2.ebuild 2694 BLAKE2B bbf84f8e968b06244776d6484b7b02a63c6561724f4acfc197003bbdd889cf71efb69a30aae57616132e8e63328dc2d4bd6070c001a99e5fc173ae53eb962b7a SHA512 0f3b2c6ac8146479ddd1f8890505ea797efe4e5fcd7ceb200f2fa59d4377f0ad5d90df6f6001970dd328c8489a2ec259a0ea3e40179134ac96f536553a4beca1
-EBUILD musescore-3.5.ebuild 3003 BLAKE2B c9d533992a7736df783760a9a5e5b5f3587e6dd21ecbc37a9866c19d20b86b75cadbe34917b6e623b358ccf4998dc77992a00a3f27f242db986ed3256b58b98f SHA512 9c9b94001c01a7d4069e219f2d12a2f802ede0ee52603001712e1746babddee6fb7ae3f7a6d7a96a65c5040e089e46352dc366660d295bf0dcf2cc55d9dc5d51
-EBUILD musescore-9999.ebuild 2948 BLAKE2B e4fe6270fbdbcad61e86b011e64fe952415afcef2d2a4f179585fb660e90d3638fab082ddd52a6a19845d643025e7e180ba10ce0aba9daf2d57a5400cd496fd8 SHA512 bb7051721a7847a679fded90f2debf619d34bf26d4c12cb8782f539887f0eb7ef1ed7f781604945d3a2d334de920804832f3c4e34e311d1f45de9ca44175fc61
+EBUILD musescore-3.5.ebuild 3020 BLAKE2B 017f8bfdc6afe898ded02b8efef8f613a99a3478a2e5220a77ec1854bcd99fa0e7ceba69e0bec9cb1798ab25c4a3d125fd211d8f627bcd31083e195e3e2df6d5 SHA512 0c4658e30d8b48d168022b4ac6da1bd76cff8c97aedfc57909e8588567974aff72a587f0dcf78aaef4f6e760878eb5c32eedf251e84d10b6772ffcd910dcdd5b
+EBUILD musescore-9999.ebuild 2967 BLAKE2B 2c2ea26ba84b1b4755c89acb3cfb519bc07509a85fac00a3313659293c58025b9ee94e35e0cb44c590c186ec2b91d53d26f41928e11c1ad29fcac186a3263ae5 SHA512 12d38f75fc9c771a2255f4f5094183611310f60029d6beeb732e8cb57fa7b5f656b0b8c3ac8fca5c4906f05baa83b3c9a2473ea807e5b3c3b0433c757fc55ef1
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.4.2.ebuild b/media-sound/musescore/musescore-3.4.2.ebuild
deleted file mode 100644
index b151f2bf5ca4..000000000000
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.5.ebuild b/media-sound/musescore/musescore-3.5.ebuild
index d56a9bca7929..d3027a0f4a74 100644
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -12,6 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 else
 	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
@@ -23,7 +24,6 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 51e4cf8aa99c..f9ce6bb051be 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -12,6 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 else
 	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
@@ -23,7 +24,6 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 05804222e8fa..fd2390976f04 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,4 +1,4 @@
 AUX patchage-1.0.2-string.patch 329 BLAKE2B 0721d815bae7aedfed9b0d8a6a8b2a528a176684d6f01c392d290ba11b0e547504ffd5200dd754800c64e44371a2304cec5d92e0327bf7739a3839aae7415ca8 SHA512 bda153cb438980982fe19e552b5d930b4ca8f7f206a4578a259c846bebbac3ed79e9b73f50cfa176a3e5f73db1059464f5c273e408f026ef9b04f1fa89ac4368
 DIST patchage-1.0.2.tar.bz2 586298 BLAKE2B db52e267dc6ecc246ca5a30d88976c426b607c47c10cf041fe3bb0ab2d6b22d7b3c55a704be0d2fb6b87b3d23d26f15dd49b3d151d3d1dc084f290f4e7ccb01d SHA512 8d59bf4a71c2b41a1c9d8f72da30046568573c6cedaca69815b279fd1c24d44267da6846e219449d47f43157663abc331ef89f241d94dd16e666e06da9f81e12
 EBUILD patchage-1.0.2.ebuild 1071 BLAKE2B bd83e8d16610d33844a7ac6d4e316693f241e0c457fdf2ad9c6646c7b27004d29fbf430697cb06996fe00bbaab9dbf7f2d36995837b55fd86382bd1782bbd0d1 SHA512 035cd6edfba294a02ffb5026f5805834754df3f2ecd664f6cdffced93109d8091446f2b65a3661862bed24d1a219caaadd813af41577449fdddbada6028dffbd
-MISC metadata.xml 600 BLAKE2B 89bfd8b0da00e90fdd9fb85ca8604c80de0e2a8e471309aec0022f31f844d06c914c7536a3928179256f85b313fefaa3dec8937159f7131a03838276cca86162 SHA512 d08bd05a57ca03d9f91c0904f9a1b92e332e4475fd6729feefb63c75df2c5ad6eebd718b6e7db8482819f463606dcca888400c1560dd9b2c9e426c26634ece77
+MISC metadata.xml 460 BLAKE2B b2f9f3d58de315e1a6a807cbf8c02ace30e8ce14405078c0a694ff87667c0abaa4cec0243db6cb1f09ae2106709f030edc26eb3dde6a7cf4626b10585695b42f SHA512 a8bff330319ae354d6f6d158bc0a574d1c16be8a9794cd9bf908f5d216d56c10a1de8d51196e20799d397ad4895ea3ec80020c29d0220c1e03897c116a3094b9
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 8817f44b941c..da07c271dfdc 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -10,8 +10,4 @@
     <flag name="session">Include experimental Jack session management
       (save/restore) support</flag>
   </use>
-  <longdescription lang="en">
-    Patchage is a modular patch bay for audio and MIDI for Jack based audio
-    systems.
-  </longdescription>
 </pkgmetadata>
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index d6a6b7ca54e4..9b62dfceda6c 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
 DIST picard-2.3.1.tar.gz 3778379 BLAKE2B b829c29d95922e31479cea0c8bcb3294cd3751374e71f37d387a013529c294a695a2e2f4c8b73af5eeee2fa8f7423d24074bc18b7db130798411803c70a013ff SHA512 fb5ac4cbd02f4b832cb23e3c8b5881eeca04b7b101c015a97fc20c8e0e7871ad2098b750a0c486af958b2bf30221b0c28666313f768dc7d70389519dd795d9cd
 DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
 EBUILD picard-2.3.1.ebuild 1703 BLAKE2B 5a07646e7724a53aac11788c96938cb7b1bd0993637c1dac9915b93e1e6575fbea4a39b8b50f1aa2b951d72e62bc6f1e7eddf74f3a850812b7a521dcf4b67c2d SHA512 544e58c3e617592ec0827eaee0f2dc47f79bfd03f3c71f2542fe05339d25c8ecc05c32424e4c25fb2334c3f77488f040796ef2332910036514401afbdfc08947
-EBUILD picard-2.4.2.ebuild 1582 BLAKE2B 4dd6fc42c582ea8908f83b10254394edb30e89a666696000d648dc971a4bf7eeff54025e04102f1fafadb9eea4a3c8bea254b9124bd04f4ad15095fd384b9841 SHA512 d348ea26bbd9653844fab4a315770929531a01f52a43e261bbfde31436b6243b249dcd66ee77b7bcd3926cbcddeb9117248f2bf799817ee4a9df79a539f119c7
+EBUILD picard-2.4.2.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
 EBUILD picard-9999.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 80fbe81e8dd8..511feea537f9 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.4.2.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[dbus,declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-qt/qtgui:5
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index b4e3bcf77fbf..c4e8048f1337 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -2,4 +2,4 @@ DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90
 DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
 EBUILD playerctl-2.0.1.ebuild 1053 BLAKE2B 2d5414790ca1e1745e6c86bf2524718c37c843c162050f688072ca9385d23054fb63494a9ac41fb89579eb5b28717650186f70b2ff10cdf0093b52c26dc0aa0f SHA512 d2b1bd2e41f60fb5c61923ec8088986ac5acd695462a5d4dd7be6b7689792072e8846de0da4071c26bb00add72e19f33ee063302760a26547948f4ce7782a84d
 EBUILD playerctl-2.0.2.ebuild 893 BLAKE2B 4c7298c6c3bd2ea410d2806014a53ca5d116cef4d816d347629ae7a9626a7f39a3bd6b9f2968e4aa15d6f9d86c209c8867e27237a198693a7a9481e3850766cd SHA512 861dd884b243df3975481e2b45e995f8db602705b9ba2be1e01a121cd8bbd0304af39ffe28aa8a6d9651256121b24e9583fd26bc3429b616edc09e67ab75c1e7
-MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
+MISC metadata.xml 343 BLAKE2B ef2d8052365e3c1907a5f191523ae0abd08d81fe0da46e4429192003a4a8560d7bbe45507b0fcbc1600241e89fa3fd64c84e4c208f501a0fd0be26175c2b0c97 SHA512 8719414c1c680915060a614b3fc30b462562b953c6b5fc227f6525a8870d59010ce0e7c5c5744031ff14d4c8514bb6f451ae697f1adfd1f617de490070ea2c38
diff --git a/media-sound/playerctl/metadata.xml b/media-sound/playerctl/metadata.xml
index 42a351ac3998..35ff4c2d260c 100644
--- a/media-sound/playerctl/metadata.xml
+++ b/media-sound/playerctl/metadata.xml
@@ -1,14 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>gokturk@gentoo.org</email>
     <name>Göktürk Yüksek</name>
   </maintainer>
-  <longdescription>
-    mpris command-line controller and library for spotify, vlc,
-    audacious, bmp, xmms2, and others.
-  </longdescription>
   <upstream>
     <remote-id type="github">acrisci/playerctl</remote-id>
   </upstream>
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index cd31c64499d9..95eb315e60b4 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,10 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
 DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d498c1de0549414b728fd9eb88e238bcffde9a3bd74e75adf106b6bf4fcb120547a83892c0bca8da17bf18f2ee SHA512 a67185fcdc7419c8542e64fd54eea3302dcf44c5d8d0c3b739ce3115b00811733234807460d39585ee57b7e105a52285ee3aafa9f24d86d2af09e881ebf2e068
-DIST qmmp-1.4.0.tar.bz2 1293438 BLAKE2B 9da3a00a31dd0ad03f3405dbae65f55d7b4fbde2a3a030d2cbe8d11ac9b5660754e519aff19431dada792f2ebb02e40fa05e177ad6bedc37e3aa5d7e2a441642 SHA512 b4ae764c223e1ce28477e86493ba409429e191ff51ef11d9b7c4fa356f90e5ff7e390bc8d1dcaf7779b231d59bf668d64000ea196b4020a7255eeb009706643d
 DIST qmmp-1.4.1.tar.bz2 1296224 BLAKE2B 4a4b72f30bbfb06d312d69c9c0d48fcaaed2d936453ab29c0bd5223819358d2894f4f016a8203c2ea15b7a193b811ae2892e700dec98e580393a9fbf5e0f767c SHA512 af971447383730328e33dc724b9d598a26404517d5aa6e8bb5a2d84bbeb1f628d363383bb5ddc571855d8416b084edd09f64174de7985788671e47317ec9f1bf
 EBUILD qmmp-1.3.2-r1.ebuild 4207 BLAKE2B 3da46dab28fbf9747f35cefae578dcc3b407abc2c5b032060e7eb8a401911ab5f4a798932e42e82fd2967e45ee4af90aa7d7d63b0455a468c2bca50a4dbffb7a SHA512 4d8eb5669edde5f39c4a0212f4bda8704606f3c995996c6660d97ca2711bd63af80e88c08e666d09b09853684ec26506b432d4242a09c38bb5c8d6e140abfb51
 EBUILD qmmp-1.3.7.ebuild 4181 BLAKE2B b3bec00895515fda32c1cafb6c261fcfc9408176e865f3629189e7bfbca5269661fab298466ce1185a41c54f29b5a1e2d9e69eed8378eee25e733d84405b6c1c SHA512 83b77d61fe775d1b4d4f475cb49a9c48eadd366a7e09b11fd8244afaecdf4b355afeed0dad9aedcbbd1472e790b212c6a1c2e2094bd171c10509485d795e68bc
-EBUILD qmmp-1.4.0.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 EBUILD qmmp-1.4.1.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.4.0.ebuild b/media-sound/qmmp/qmmp-1.4.0.ebuild
deleted file mode 100644
index 45e48d80e0dc..000000000000
--- a/media-sound/qmmp/qmmp-1.4.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.3"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		virtual/jack
-	)
-	ladspa? ( media-plugins/cmt-plugins )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index a992a942c4cd..c48da3f7bde2 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -3,5 +3,5 @@ DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d
 DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
 EBUILD qsynth-0.6.2.ebuild 1400 BLAKE2B a1cb77b898f94ed280c1ba061bd6af65e7819fbcd204b1c52f6ed712f4b8b997eb1049c692a1b72c8a620eb4dcc118d44d8e42931a9adfab4f0bbab17bb6cf20 SHA512 cc3fa6b94b342d42541cb9b01aacaf349dee2cd9c73fab482c0ee8d78de5cb3dbecd2ca2924c7f6790ab565143690b324352a0bc1e19ca339252f9dec4e83f75
 EBUILD qsynth-0.6.3.ebuild 1360 BLAKE2B 85c307a92f7b1168e5798740147434197642ebbc375b34e25c0ad67c81aee08a9ef92346a0d5e411ad6acad722c9291b982dd7eb0fc3270bb729897fe1a1db5c SHA512 697327bee1cdb81af3e3b68eaf2d247b7a26785d9c8ae89450deacf63dc9f391520eae1694de9ebef6569bf1a47c96b539bf31c42d80d5ee1268b2d470c231b3
-EBUILD qsynth-9999.ebuild 1399 BLAKE2B c37202cdc8cacadeccaff9256aa15d0d2877f2e69a2806d3d807b506ae1f8e17120f641f05c06a55322f080297b8fc5dfbf4a06234a6d8e86547d3605d83ca47 SHA512 5e58896d4ea6e3c85e6abcdf5d2f973e6e5c9f234814e3571d400cda70f82c257c1f7dab0a89c8ac6859bfb39f6fa09528602cef1eef9a81e852d51e07a5da1c
+EBUILD qsynth-9999.ebuild 1342 BLAKE2B 50e392bce3538d4575431df3b0254d0f9d757673288d85acef014a7054e6929bcc7f2a5af6fc74d27ab90fe2bacb3a3460349de3b8bc46979ea550d62c89e298 SHA512 442cc6f5eeb08d94fb4113cf710d1f22218e57fee336110ba8a9462174655fc04971bbb63d10a5957f2671ddb2155f415fffd7e21c0952877737c8bb4c59aed2
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index 341c0c4efdbb..7866d934551b 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -28,8 +28,6 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 8f8a3e4d5624..9a3cd7e1ea63 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -9,4 +9,4 @@ DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6
 DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
 DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
 EBUILD sc2mpd-1.1.5.ebuild 4562 BLAKE2B fbecb9f945afb3d1ba06e15cdcabefc762cd4a68919208001843fbf6dac4b5b52bd773934b8db7f685f31e9f2508a4d06e4c05223c69fb3658a2a681ceaf3a2a SHA512 c2f91e7fb6b48cda77c204c631d44f6765433d7d9f01872a17a99f588f3fe09dc2827cbc48104b8752defb27b607612dc7bbd20fc478748a9f52fba435c221c8
-MISC metadata.xml 313 BLAKE2B 81be81a3249c77371bf3c159e69a7151fd4763449f1b32cb02de42e774e4e050b45197e0a22dd294b3f9f116c680d18e18c03437bc571952b6739a01f5b04180 SHA512 993a3648e52c72afc8cceb7cf87a3bbf28658f106ca0b12c2e90f098e8d02b6d73f6e1ff728aef86715daae17533a17e6495d8110c59f91e116e84587ef5eddc
+MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/metadata.xml b/media-sound/sc2mpd/metadata.xml
index 6d9ed9356fb5..411334230662 100644
--- a/media-sound/sc2mpd/metadata.xml
+++ b/media-sound/sc2mpd/metadata.xml
@@ -4,5 +4,4 @@
 <maintainer type="person">
 	<email>stasibear@gentoo.org</email>
 </maintainer>
-<longdescription>Implements the SongCast protocol for use by upmpdcli and mpd</longdescription>
 </pkgmetadata>
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index bd8ea8d03498..ed03ef4dfd3a 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -1,7 +1,4 @@
-AUX sndfile-tools-1.03-remove-Werror.patch 660 BLAKE2B 2f85751bff305926e47888b8da6b2a9bbf2ff21c85a56c76aa226770e79f20caaf5dfbcac0963c177b513865b3623eba86e7dd768d4f65da0dd497c09c189029 SHA512 e16c01184b118f7a412f50f05470da41b73fad9258e0c8108ab8cc0c2eaf70e09f4832d4b060b90e5e189535f83cf18d62180d9496b30910669385467c6fa919
-DIST sndfile-tools-1.03.tar.gz 474494 BLAKE2B 17c8f6782895a5e02bcd39e0e966a9196fe26b8fa192b3375a4f167cb554de168d4ce4e638d792720ee3e74483a88060ef9bf6d3713c91834acc9b39427185e2 SHA512 bc6ac7977a95ccf845c889db81452ae84b4f10a8f51c91ddd6fe4d926337a60cdbcb2859b0758816622554bf26a6e42b70f791f2c5158926c3f92ab2abbf14dc
-DIST sndfile-tools-1.04.tar.bz2 714880 BLAKE2B 14d8f9a8172e4e3d8fe320baf3e546c3998636c0de36e8b41e38e277c18f2af6c3ea944eb4cecdda0e225fa3d7adbcd3a5618e74a9d567c42eb0056f162703e3 SHA512 90b0121f4d0bf3ebf3962cc47bcd6a11e5a644d0567be137a8bcf5881944e03e3c9650c9813c982a58072154f62dd176c46cfe83e5661ff81205db30923b71d3
-EBUILD sndfile-tools-1.03-r1.ebuild 566 BLAKE2B 4ce23c6046c637aba54338e506ee85cf8833d0dea7d462e7f2bc489096ebbd7185fbf08e9a53fb2b3d9a22a62171920367d42c86eb60576ffff76421b47ce6ee SHA512 2608ff60cc47f06c37955cd85c76ebfb698a86cfdf24bad580262a73ee465b187e7bd479760c7a74ec7d7a09694c8fc2f68ddc3fc8c9fa4176099e6b3f459c24
-EBUILD sndfile-tools-1.04.ebuild 790 BLAKE2B 88cf4dab199359745db0bf7221af87f1ef6f4697546c0e011b9c2f9963ed2735e32275c88559ba38a075c5b7789676018ed808c05ed27d420c9f6a22648f63e3 SHA512 15d27798bd10316f4bd94de55b4e2af78aacf7e622af92ab0a7bd8290b95ab81c0c064d730550b91e7852e0e89dddfa85621eacb36217ef49acc4458eb022c66
-EBUILD sndfile-tools-9999.ebuild 790 BLAKE2B 88cf4dab199359745db0bf7221af87f1ef6f4697546c0e011b9c2f9963ed2735e32275c88559ba38a075c5b7789676018ed808c05ed27d420c9f6a22648f63e3 SHA512 15d27798bd10316f4bd94de55b4e2af78aacf7e622af92ab0a7bd8290b95ab81c0c064d730550b91e7852e0e89dddfa85621eacb36217ef49acc4458eb022c66
+DIST sndfile-tools-1.04a.tar.bz2 715692 BLAKE2B e65a222bfdd96803293f006c2c5704fd1037d81524559d86c8e3812b91bd90fa0b47d1f589adb303f68e1ffdbebfd8b4ec616c9f1d897ad993768981c83022e3 SHA512 b93fd74386960c986031fd1652335bc34243bd785ccf31480b82f4d76ef86760ca53173aace273a635db70db46c0c1c4066328aef9c21c01c6e76346dbe56390
+EBUILD sndfile-tools-1.04-r1.ebuild 814 BLAKE2B 7bc18f59b0cedaee69f0f7112174f99ae2ac05a8f9633f86f255b920ec31744f4dd7eeaebc3c57af27d2db6e802ff9c4686726db1eb65fe6d53467baa1b67d55 SHA512 4476acf6d5a8cec31fdc033c795b354d1c77e25c4622032188490c3065212a81e35cddb0893656167cbda5ed241cbce7e0259b4c0614968f4485ea6d6baf02fb
+EBUILD sndfile-tools-9999.ebuild 797 BLAKE2B 0bbc1527cc2ca304fc378dd1096f996ccf87d5bb0405ddc557f86a67cd25bd53fe3d53c9300f73363343efa1daefe2c8d6f78eb1e041966455d9dd6db9eb9986 SHA512 47580fac47af1ff1e3b3b6a1ba6e6ca4d9d9ba3c822b74da91b221998e48c58ac17ce5f5306439a48dce997c857955f200f717146e991bc1515ee881e8e39b38
 MISC metadata.xml 572 BLAKE2B 473449aba53817e0599e9135148ddf893d438fba7bac2325c923a180c3ef10fb63de920af5e1201117d1130647455e7f57f6e131cffd0ac9d5b82e6750ff014c SHA512 9d91c621d44f3a3bb70ac84f026d746db918ce6ba0c4b6b9b7e2c85811e10f4c7936cbb15368ae1d38bed6a593115ec7a63f6966aae30cc88140c6edf3527ec2
diff --git a/media-sound/sndfile-tools/files/sndfile-tools-1.03-remove-Werror.patch b/media-sound/sndfile-tools/files/sndfile-tools-1.03-remove-Werror.patch
deleted file mode 100644
index 11c71c79310a..000000000000
--- a/media-sound/sndfile-tools/files/sndfile-tools-1.03-remove-Werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove -Werror from CFLAGS causing all sorts of havoc due to
-deprecated declarations in media-sound/jack-audio-connection-kit
-See also: https://bugs.gentoo.org/show_bug.cgi?id=542120
-
---- sndfile-tools-1.03/configure
-+++ sndfile-tools-1.03/configure
-@@ -11397,9 +11397,6 @@
- 	CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wpointer-arith"
- 	# -Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion -Winline"
- 
--	if test x$ac_arg_gcc_werror = "xyes" ; then
--		CFLAGS="-Werror $CFLAGS"
--		fi
- 
- 
- $as_echo "#define COMPILER_IS_GCC 1" >>confdefs.h
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.03-r1.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.03-r1.ebuild
deleted file mode 100644
index 052ea1b02f8f..000000000000
--- a/media-sound/sndfile-tools/sndfile-tools-1.03-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A small collection of programs that use libsndfile"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
-SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/libsndfile-1.0.19
-	>=x11-libs/cairo-1.4.0
-	sci-libs/fftw:3.0
-	media-sound/jack-audio-connection-kit"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/${P}-remove-Werror.patch"
-)
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.04.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild
index 46defab32442..946196cd2f67 100644
--- a/media-sound/sndfile-tools/sndfile-tools-1.04.ebuild
+++ b/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="A small collection of programs that use libsndfile"
+DESCRIPTION="Small collection of programs that use libsndfile"
 HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
 else
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2"
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2 -> ${P}a.tar.bz2"
 	KEYWORDS="~amd64"
 fi
 
@@ -18,15 +18,17 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="jack"
 
-RDEPEND="
-	media-libs/libsndfile:=
-	media-libs/libsamplerate:=
-	x11-libs/cairo:=
-	sci-libs/fftw:3.0=
-	jack? ( media-sound/jack-audio-connection-kit:= )"
 DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}"
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	x11-libs/cairo
+	sci-libs/fftw:3.0=
+	jack? ( virtual/jack )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/libsamplerate-0.1.9-r1
+"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
index 46defab32442..6ed4dd5751d3 100644
--- a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
+++ b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="A small collection of programs that use libsndfile"
+DESCRIPTION="Small collection of programs that use libsndfile"
 HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
 
 if [[ ${PV} == *9999 ]]; then
@@ -18,15 +18,17 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="jack"
 
-RDEPEND="
-	media-libs/libsndfile:=
-	media-libs/libsamplerate:=
-	x11-libs/cairo:=
-	sci-libs/fftw:3.0=
-	jack? ( media-sound/jack-audio-connection-kit:= )"
 DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}"
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	x11-libs/cairo
+	sci-libs/fftw:3.0=
+	jack? ( virtual/jack )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/libsamplerate-0.1.9-r1
+"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index b09bdfd1ba21..739fdf4e44e5 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -2,4 +2,4 @@ AUX sndpeek-1.4-gcc.patch 315 BLAKE2B 782db101136b691904424dea1d72c02a4308ce9901
 AUX sndpeek-1.41-makefile.patch 8410 BLAKE2B 13df444073c55efac49ea862957375b2284567134bf1313069e4b41254232440b6e7f83c25e79cfc62611caa0a215cc56d14f130a5bfa2d8b4ded307860ba3cb SHA512 9999454775686174bb9561eefb0150cd7031ed2faad26c5830a367e21a844aee62dd0ced65cb17a7cd063f45cc05c6824f3abc5d427ad3ba2c8b5c0efb5de71a
 DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465
 EBUILD sndpeek-1.41-r1.ebuild 1599 BLAKE2B 187ce2f3860f4346b93b8733e4fff6fb0e88de0f35c29256ffda7a49a80928b6c608cd6fd05c6c17653b954a15aa4ba4031ecd844b5f8a2725bb73f5e0ae7074 SHA512 f330b9951dafa25fda881bdf1e9bf64c57672e1d39d80f12039c7960b61ea152803939f356b9a96f23d992ea42cd720602db4f708b4400c01716399065a1e993
-MISC metadata.xml 334 BLAKE2B d0828ab0ff2b5bc3a88013773a5653206e57420f5d0eceadcfa7db7e587d24e12ded0edd775123ecdb887b3adf8f357599f59a6b0997667346ab846d6656bd52 SHA512 13ab3514fb82b417aa9b69680d3370a9f674c307a10a289de8b370c9cbd7e8a6b3aa14a00b2d69885e8805473940cf0dbf1606571827e021c5245c20e0078fa8
+MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/sndpeek/metadata.xml b/media-sound/sndpeek/metadata.xml
index 925b41262c7f..ee7258ac28eb 100644
--- a/media-sound/sndpeek/metadata.xml
+++ b/media-sound/sndpeek/metadata.xml
@@ -5,7 +5,4 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<longdescription lang="en">
-		real-time audio visualization
-	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 3d36f83909a2..c74cf65136ae 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,15 +1,3 @@
-AUX sox-14.4.2-CVE-2017-11332.patch 792 BLAKE2B 07da752434571a68102c0b712656ca9642b85a67c9f0e740a75fff979c4f8746b152aa0e060dc490ed6b6bdf62eaab29b562ef929cbada035a12fcc76ce6bf15 SHA512 8c26bea077b503c8ec420880539f2a6e275d2b3c26eb5b4c5af38aae16b258a29ceb946aeb2252e47aeea22e5b6513c628a7ee3eb3d201d6fa541456b16bd399
-AUX sox-14.4.2-CVE-2017-11333.patch 1635 BLAKE2B 9dad961dd2679bc87dbf0422de01c3777362a382364db060a08db5265c087d0a943b9be970e886b1ae89c9a451aba13613f13233a5338e6d0100f114543ed4ac SHA512 5e87a6cd045cd499da0af495e09c178c342b36ff3f753d90bb73bca3745223746b3c704db85f60a2d9867d9ac37e715ae819f0a4f90039551c722c0c90af2b27
-AUX sox-14.4.2-CVE-2017-11358.patch 987 BLAKE2B 499968de437944f9261756d3cbc9dd54c60f10eaac02b074348e390fcfe8b3d3c4adb7f599b98e47596bbb87b88d0c9dfc5f3ba027a798b4aeb6038fd7b40be8 SHA512 b2a096659cc98bd50322441d3611e607b71c54025feaf7c2acc322fff8c0ef5a83f06bef31099c4adf1794009b050a3f2dca71c7926892c60081261384891ac4
-AUX sox-14.4.2-CVE-2017-11359.patch 903 BLAKE2B 89bcfbca682ec4ba1529b974e9d767c5a6a87632c92324d2794db5c45e48b7723b334564143037f17c27ffb0d2e330dadc274ef3f0a9fa9ee5ad3f45ad8239e9 SHA512 6fb075c09cfedaec6bb6760ba2e0d55446478c8e2873884b6a940d42f44ad8e840809f8b31b59ff3d40307dd48d74dadf809859dfef190269da8800185b462a6
-AUX sox-14.4.2-CVE-2017-15370.patch 1065 BLAKE2B 1e8609d127c146f378b0c5ae2195fdcabc33230d4685aab3b93c217b748998a82d3d7a46888a32fc61260672b64d9da266d339311142d630f418ae727d91d847 SHA512 e5c079f8e8e4603e068a092db86ec6dea4da395f75fb4bfa284736edce2d8ea3441deda51ca7dce8865e1ac5914cdf9c6767ed74203726f26992e9d76f4d8b0b
-AUX sox-14.4.2-CVE-2017-15371.patch 1313 BLAKE2B 9b6a97d4b2fda76295e2ae260cba76c3a97dc90ec409f450c4eb20367ed8038aac533cf6147d8efb840054fa28e85238c89e85783c082ccefd55a086b94cbb58 SHA512 122783ba75b4ed9062071ace42f7d702e5b37b8d81e479d37ad0e1c4addbf3efd167f4d56c32e9518b3dcb8d20e54f53cb2b573343195823dd871764d1b24fd9
-AUX sox-14.4.2-CVE-2017-15372.patch 3745 BLAKE2B 966abb4f59894e8dec2a29376c4b548640838f489467e9e31b8f1720196ae825f4c401fe738b0252742fa412a220aff98dbe2bad6d9184c0ea037ece610ad0d4 SHA512 ba8e52d02eb453fbdc7cf066c42c2c00591a355026508406029882ab665ec2567dc03efcc7e0ebec9309b7606ba44d2377c25b9e4eeadbb30457304852bfc31c
-AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e62a9c5ef6cbce9609f2ad221af0555a2d1990bce38db24c5e127a05b2784ded42faed15a2a018fb73b6416f3c1be4b5a5 SHA512 dfccffbf6be7951c217e8b98a96a6cd48c31d077a535c0e03beffc8f2fea82aa71c0e5d941caa1364771aa0cef8ae915aa5c3e7be8948375151537cc1a8ebdb8
-AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
-AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
-DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
 DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
-EBUILD sox-14.4.2-r1.ebuild 2598 BLAKE2B 337d1484a42517ed096862cf30c6b251d2d0bc5cf6bd119fb53d881dcd059fb563948985359be95a794b86be4cee1e091836c0038f969caba4f9dcb6960c1da4 SHA512 66d7c2bbafbfa61626ff399f056d2bb3208e403cc83b44f7a66447e53273bc5716b0cc3d13f46f2a5669461f4ffa6dab5a23be7b24599f70584c3aebf025389f
-EBUILD sox-14.4.2_p20200803.ebuild 2808 BLAKE2B 6a7a21aa471f5cee187f3cd2fd0cc50a5fcea6ac3fe784dfbada7f202bea6bf4f3c263e6b171a3349fd672ccc82aed1c84561e08acb1d0c977d779c54de3f40f SHA512 6cbba3b64e3e50be82c4b73474ff61d0338310b3c514948eb3c08568cf3e320abe971eef99b8e31cc873dd24ea2f5a800d7d00580c63814a325fe2beb64553db
+EBUILD sox-14.4.2_p20200803.ebuild 2807 BLAKE2B 9fa88bd12d6c2b861c199e92ac0901265fd7cdf0604794e09b419df277ab5014d43b7fce1ad781347a666426c19e62200def500b08d9865cc42c58764ab7cc62 SHA512 3fc163eb2cd9c5c1423da4a59d77efe36bbf18cba855ac71f2840d96c2c128cd983220f9f1bec9d05a2c8bc42e5a672b9945f3b97844aa7a0ce5c5ffeb1e6d07
 MISC metadata.xml 653 BLAKE2B 73d6e024f7b8cf87cc0640a749af4bf3d45604e9e28cd9ff1f68fea9b7f4c05ff2e1ee676efd07d1221070492a3575c1f4397cfe7008df00403232353f22afcd SHA512 578f6db7fbe2ae3dc3a732a2cbfb8627bfcce1801b4834071040df1b9e3bf20ca9dd6e7a8d7df221d38f4e8fff22cefa6ad57fd19dc145ab4a247f688c497c71
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11332.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11332.patch
deleted file mode 100644
index 2b4448ed2d71..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-11332.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7405bcaacb1ded8c595cb751d407cf738cb26571 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 16:29:28 +0000
-Subject: [PATCH] wav: fix crash if channel count is zero (CVE-2017-11332)
-
----
- src/wav.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/wav.c b/src/wav.c
-index 3e80e692..3eaebfa7 100644
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -712,6 +712,11 @@ static int startread(sox_format_t * ft)
-     else
-         lsx_report("User options overriding channels read in .wav header");
- 
-+    if (ft->signal.channels == 0) {
-+        lsx_fail_errno(ft, SOX_EHDR, "Channel count is zero");
-+        return SOX_EOF;
-+    }
-+
-     if (ft->signal.rate == 0 || ft->signal.rate == dwSamplesPerSecond)
-         ft->signal.rate = dwSamplesPerSecond;
-     else
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11333.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11333.patch
deleted file mode 100644
index a9a5b2762199..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-11333.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 93b6e4b5b0efa47b318151d39c35277fc06525f1 Mon Sep 17 00:00:00 2001
-Message-Id: <93b6e4b5b0efa47b318151d39c35277fc06525f1.1511192342.git.agx@sigxcpu.org>
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Wed, 15 Nov 2017 18:36:58 +0100
-Subject: [PATCH] Handle vorbis_analysis_headerout errors
-
-This is related to
-
-    https://github.com/xiph/vorbis/pull/34
-
-but could also happen today with on other errors in the called function.
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882236
-Forwarded: sox-devel@lists.sourceforge.net
----
- src/vorbis.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-Index: sox/src/vorbis.c
-===================================================================
---- sox.orig/src/vorbis.c
-+++ sox/src/vorbis.c
-@@ -270,8 +270,11 @@ static int write_vorbis_header(sox_forma
-       vc.comment_lengths[i] = strlen(text);
-     }
-   }
--  vorbis_analysis_headerout(    /* Build the packets */
--      &ve->vd, &vc, &header_main, &header_comments, &header_codebooks);
-+  if (vorbis_analysis_headerout(    /* Build the packets */
-+      &ve->vd, &vc, &header_main, &header_comments, &header_codebooks) < 0) {
-+      ret = HEADER_ERROR;
-+      goto cleanup;
-+  }
- 
-   ogg_stream_packetin(&ve->os, &header_main);   /* And stream them out */
-   ogg_stream_packetin(&ve->os, &header_comments);
-@@ -280,6 +283,7 @@ static int write_vorbis_header(sox_forma
-   while (ogg_stream_flush(&ve->os, &ve->og) && ret == HEADER_OK)
-     if (!oe_write_page(&ve->og, ft))
-       ret = HEADER_ERROR;
-+cleanup:
-   for (i = 0; i < vc.comments; ++i)
-     free(vc.user_comments[i]);
-   free(vc.user_comments);
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11358.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11358.patch
deleted file mode 100644
index 6cd8c2bb15f6..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-11358.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6cb44a44b9eda6b321ccdbf6483348d4a9798b00 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 16:43:35 +0000
-Subject: [PATCH] hcom: fix crash on input with corrupt dictionary
- (CVE-2017-11358)
-
----
- src/hcom.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/hcom.c b/src/hcom.c
-index c62b020c..1b0e09dd 100644
---- a/src/hcom.c
-+++ b/src/hcom.c
-@@ -150,6 +150,11 @@ static int startread(sox_format_t * ft)
-                 lsx_debug("%d %d",
-                        p->dictionary[i].dict_leftson,
-                        p->dictionary[i].dict_rightson);
-+                if ((unsigned) p->dictionary[i].dict_leftson >= dictsize ||
-+                    (unsigned) p->dictionary[i].dict_rightson >= dictsize) {
-+                        lsx_fail_errno(ft, SOX_EHDR, "Invalid dictionary");
-+                        return SOX_EOF;
-+                }
-         }
-         rc = lsx_skipbytes(ft, (size_t) 1); /* skip pad byte */
-         if (rc)
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11359.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11359.patch
deleted file mode 100644
index 180d7d1c867b..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-11359.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8b590b3a52f4ccc4eea3f41b4a067c38b3565b60 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 17:02:11 +0000
-Subject: [PATCH] wav: fix crash writing header when channel count >64k
- (CVE-2017-11359)
-
----
- src/wav.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/wav.c b/src/wav.c
-index 3eaebfa7..fad334cf 100644
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -1379,6 +1379,12 @@ static int wavwritehdr(sox_format_t * ft, int second_header)
-     long blocksWritten = 0;
-     sox_bool isExtensible = sox_false;    /* WAVE_FORMAT_EXTENSIBLE? */
- 
-+    if (ft->signal.channels > UINT16_MAX) {
-+        lsx_fail_errno(ft, SOX_EOF, "Too many channels (%u)",
-+                       ft->signal.channels);
-+        return SOX_EOF;
-+    }
-+
-     dwSamplesPerSecond = ft->signal.rate;
-     wChannels = ft->signal.channels;
-     wBitsPerSample = ft->encoding.bits_per_sample;
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15370.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15370.patch
deleted file mode 100644
index 473c383a663a..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-15370.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ef3d8be0f80cbb650e4766b545d61e10d7a24c9e Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 16:21:23 +0000
-Subject: [PATCH] wav: ima_adpcm: fix buffer overflow on corrupt input
- (CVE-2017-15370)
-
-Add the same check bad block size as was done for MS adpcm in commit
-f39c574b ("More checks for invalid MS ADPCM blocks").
----
- src/wav.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wav.c b/src/wav.c
-index 5202556c..3e80e692 100644
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -127,7 +127,7 @@ static unsigned short  ImaAdpcmReadBlock(sox_format_t * ft)
-         /* work with partial blocks.  Specs say it should be null */
-         /* padded but I guess this is better than trailing quiet. */
-         samplesThisBlock = lsx_ima_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t) 0);
--        if (samplesThisBlock == 0)
-+        if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock)
-         {
-             lsx_warn("Premature EOF on .wav input file");
-             return 0;
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15371.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15371.patch
deleted file mode 100644
index cde253da4ecb..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-15371.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 818bdd0ccc1e5b6cae742c740c17fd414935cf39 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 15:57:48 +0000
-Subject: [PATCH] flac: fix crash on corrupt metadata (CVE-2017-15371)
-
----
- src/flac.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-Index: sox/src/flac.c
-===================================================================
---- sox.orig/src/flac.c
-+++ sox/src/flac.c
-@@ -119,9 +119,10 @@ static void decoder_metadata_callback(FL
-     p->total_samples = metadata->data.stream_info.total_samples;
-   }
-   else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-+    const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment;
-     size_t i;
- 
--    if (metadata->data.vorbis_comment.num_comments == 0)
-+    if (vc->num_comments == 0)
-       return;
- 
-     if (ft->oob.comments != NULL) {
-@@ -129,8 +130,9 @@ static void decoder_metadata_callback(FL
-       return;
-     }
- 
--    for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
--      sox_append_comment(&ft->oob.comments, (char const *) metadata->data.vorbis_comment.comments[i].entry);
-+    for (i = 0; i < vc->num_comments; ++i)
-+      if (vc->comments[i].entry)
-+        sox_append_comment(&ft->oob.comments, (char const *) vc->comments[i].entry);
-   }
- }
- 
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15372.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15372.patch
deleted file mode 100644
index 8671213a98f3..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-15372.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 3f7ed312614649e2695b54b398475d32be4f64f3 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Wed, 8 Nov 2017 00:29:14 +0000
-Subject: adpcm: fix stack overflow with >4 channels (CVE-2017-15372)
-
----
- src/adpcm.c | 8 +++++++-
- src/adpcm.h | 3 +++
- src/wav.c   | 5 ++++-
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-Index: sox/src/adpcm.c
-===================================================================
---- sox.orig/src/adpcm.c
-+++ sox/src/adpcm.c
-@@ -71,6 +71,11 @@ const short lsx_ms_adpcm_i_coef[7][2] =
-                         { 392,-232}
- };
- 
-+extern void *lsx_ms_adpcm_alloc(unsigned chans)
-+{
-+        return lsx_malloc(chans * sizeof(MsState_t));
-+}
-+
- static inline sox_sample_t AdpcmDecode(sox_sample_t c, MsState_t *state,
-                                sox_sample_t sample1, sox_sample_t sample2)
- {
-@@ -102,6 +107,7 @@ static inline sox_sample_t AdpcmDecode(s
- 
- /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */
- const char *lsx_ms_adpcm_block_expand_i(
-+        void *priv,
-         unsigned chans,          /* total channels             */
-         int nCoef,
-         const short *coef,
-@@ -113,7 +119,7 @@ const char *lsx_ms_adpcm_block_expand_i(
-   const unsigned char *ip;
-   unsigned ch;
-   const char *errmsg = NULL;
--  MsState_t state[4];  /* One decompressor state for each channel */
-+  MsState_t *state = priv;  /* One decompressor state for each channel */
- 
-   /* Read the four-byte header for each channel */
-   ip = ibuff;
-Index: sox/src/adpcm.h
-===================================================================
---- sox.orig/src/adpcm.h
-+++ sox/src/adpcm.h
-@@ -29,8 +29,11 @@
- /* default coef sets */
- extern const short lsx_ms_adpcm_i_coef[7][2];
- 
-+extern void *lsx_ms_adpcm_alloc(unsigned chans);
-+
- /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */
- extern const char *lsx_ms_adpcm_block_expand_i(
-+	void *priv,
- 	unsigned chans,          /* total channels             */
- 	int nCoef,
- 	const short *coef,
-Index: sox/src/wav.c
-===================================================================
---- sox.orig/src/wav.c
-+++ sox/src/wav.c
-@@ -82,6 +82,7 @@ typedef struct {
-     /* following used by *ADPCM wav files */
-     unsigned short nCoefs;          /* ADPCM: number of coef sets */
-     short         *lsx_ms_adpcm_i_coefs;          /* ADPCM: coef sets           */
-+    void          *ms_adpcm_data;   /* Private data of adpcm decoder */
-     unsigned char *packet;          /* Temporary buffer for packets */
-     short         *samples;         /* interleaved samples buffer */
-     short         *samplePtr;       /* Pointer to current sample  */
-@@ -175,7 +176,7 @@ static unsigned short  AdpcmReadBlock(so
-         }
-     }
- 
--    errmsg = lsx_ms_adpcm_block_expand_i(ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock);
-+    errmsg = lsx_ms_adpcm_block_expand_i(wav->ms_adpcm_data, ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock);
- 
-     if (errmsg)
-         lsx_warn("%s", errmsg);
-@@ -791,6 +792,7 @@ static int startread(sox_format_t * ft)
- 
-         /* nCoefs, lsx_ms_adpcm_i_coefs used by adpcm.c */
-         wav->lsx_ms_adpcm_i_coefs = lsx_malloc(wav->nCoefs * 2 * sizeof(short));
-+        wav->ms_adpcm_data = lsx_ms_adpcm_alloc(wChannels);
-         {
-             int i, errct=0;
-             for (i=0; len>=2 && i < 2*wav->nCoefs; i++) {
-@@ -1216,6 +1218,7 @@ static int stopread(sox_format_t * ft)
-     free(wav->packet);
-     free(wav->samples);
-     free(wav->lsx_ms_adpcm_i_coefs);
-+    free(wav->ms_adpcm_data);
-     free(wav->comment);
-     wav->comment = NULL;
- 
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15642.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15642.patch
deleted file mode 100644
index d43ef50d1012..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-15642.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: This fixes a use after free and double free if an empty comment
-chunk follows a non-empty one.
-Author: Mans Rullgard <mans@mansr.com>
-Forwarded: not-needed
----
- src/aiff.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: sox/src/aiff.c
-===================================================================
---- sox.orig/src/aiff.c
-+++ sox/src/aiff.c
-@@ -62,7 +62,6 @@ int lsx_aiffstartread(sox_format_t * ft)
-   size_t ssndsize = 0;
-   char *annotation;
-   char *author;
--  char *comment = NULL;
-   char *copyright;
-   char *nametext;
- 
-@@ -270,6 +269,7 @@ int lsx_aiffstartread(sox_format_t * ft)
-       free(annotation);
-     }
-     else if (strncmp(buf, "COMT", (size_t)4) == 0) {
-+      char *comment = NULL;
-       rc = commentChunk(&comment, "Comment:", ft);
-       if (rc) {
-         /* Fail already called in function */
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-18189.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-18189.patch
deleted file mode 100644
index fd04bcdff131..000000000000
--- a/media-sound/sox/files/sox-14.4.2-CVE-2017-18189.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: A corrupt header specifying zero channels would send read_channels()
-into an infinite loop.  Prevent this by sanity checking the channel
-count in open_read().  Also add an upper bound to prevent overflow
-in multiplication.
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881121
-Author: Mans Rullgard <mans@mansr.com>
- Jaromír Mikeš <mira.mikes@seznam.cz>
-Forwarded: not-needed
-
----
- src/xa.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: sox/src/xa.c
-===================================================================
---- sox.orig/src/xa.c
-+++ sox/src/xa.c
-@@ -143,6 +143,12 @@ static int startread(sox_format_t * ft)
-         lsx_report("User options overriding rate read in .xa header");
-     }
- 
-+    if (ft->signal.channels == 0 || ft->signal.channels > UINT16_MAX) {
-+        lsx_fail_errno(ft, SOX_EFMT, "invalid channel count %d",
-+                       ft->signal.channels);
-+        return SOX_EOF;
-+    }
-+
-     /* Check for supported formats */
-     if (ft->encoding.bits_per_sample != 16) {
-         lsx_fail_errno(ft, SOX_EFMT, "%d-bit sample resolution not supported.",
diff --git a/media-sound/sox/files/sox-14.4.2-wavpack-chk-errors-on-init.patch b/media-sound/sox/files/sox-14.4.2-wavpack-chk-errors-on-init.patch
deleted file mode 100644
index 4ebb31c0ae94..000000000000
--- a/media-sound/sox/files/sox-14.4.2-wavpack-chk-errors-on-init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: wavpack: check errors when initializing
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881145
-Author:  Eric Wong <normalperson@yhbt.net>
- Jaromír Mikeš <mira.mikes@seznam.cz>
-Forwarded: not-needed
-
- src/wavpack.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/wavpack.c b/src/wavpack.c
-index 9e525cd4..b7e8dafa 100644
---- a/src/wavpack.c
-+++ b/src/wavpack.c
-@@ -65,6 +65,10 @@ static int start_read(sox_format_t * ft)
-   char msg[80];
- 
-   p->codec = WavpackOpenFileInputEx(&io_fns, ft, NULL, msg, OPEN_NORMALIZE, 0);
-+  if (!p->codec) {
-+    lsx_fail_errno(ft, SOX_EHDR, "%s", msg);
-+    return SOX_EOF;
-+  }
-   ft->encoding.bits_per_sample = WavpackGetBytesPerSample(p->codec) << 3;
-   ft->signal.channels   = WavpackGetNumChannels(p->codec);
-   if (WavpackGetSampleRate(p->codec) && ft->signal.rate && ft->signal.rate != WavpackGetSampleRate(p->codec))
-@@ -108,6 +112,10 @@ static int start_write(sox_format_t * ft)
-   uint64_t size64;
- 
-   p->codec = WavpackOpenFileOutput(ft_write_b_buf, ft, NULL);
-+  if (!p->codec) {
-+    lsx_fail_errno(ft, SOX_ENOMEM, "WavPack error creating output instance");
-+    return SOX_EOF;
-+  }
-   memset(&config, 0, sizeof(config));
-   config.bytes_per_sample  = ft->encoding.bits_per_sample >> 3;
-   config.bits_per_sample   = ft->encoding.bits_per_sample;
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
deleted file mode 100644
index f6a0b545d51a..000000000000
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	>=media-sound/gsm-1.0.12-r1
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ao? ( media-libs/libao )
-	encode? ( >=media-sound/lame-3.98.4 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	id3tag? ( media-libs/libid3tag )
-	ladspa? ( media-libs/ladspa-sdk )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	opus? (
-		media-libs/opus
-		media-libs/opusfile
-	)
-	png? (
-		media-libs/libpng:0=
-		sys-libs/zlib
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.11 )
-	twolame? ( media-sound/twolame )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2017-11332.patch
-	"${FILESDIR}"/${P}-CVE-2017-11333.patch
-	"${FILESDIR}"/${P}-CVE-2017-11358.patch
-	"${FILESDIR}"/${P}-CVE-2017-11359.patch
-	"${FILESDIR}"/${P}-CVE-2017-15370.patch
-	"${FILESDIR}"/${P}-CVE-2017-15371.patch
-	"${FILESDIR}"/${P}-CVE-2017-15372.patch
-	"${FILESDIR}"/${P}-CVE-2017-15642.patch
-	"${FILESDIR}"/${P}-CVE-2017-18189.patch
-	"${FILESDIR}"/${P}-wavpack-chk-errors-on-init.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die #386027
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with amr amrnb) \
-		$(use_with amr amrwb) \
-		$(use_with ao) \
-		$(use_enable debug) \
-		$(use_with encode lame) \
-		$(use_with flac) \
-		$(use_with id3tag) \
-		$(use_with ladspa) \
-		$(use_with mad) \
-		$(use_enable openmp) \
-		$(use_with ogg oggvorbis) \
-		$(use_with oss) \
-		$(use_with opus) \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with sndfile) \
-		$(use_enable static-libs static) \
-		$(use_with twolame) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-}
-
-src_install() {
-	default
-	# libltdl is used for loading plugins, keeping libtool files with empty
-	# dependency_libs what otherwise would be -exec rm -f {} +
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-sound/sox/sox-14.4.2_p20200803.ebuild b/media-sound/sox/sox-14.4.2_p20200803.ebuild
index b7a36d3f5f35..aca286171c86 100644
--- a/media-sound/sox/sox-14.4.2_p20200803.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20200803.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 BDEPEND="
diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest
deleted file mode 100644
index 1b5884b1cb3a..000000000000
--- a/media-sound/specimen/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX specimen-0.5.2_rc3-jackmidi.patch 1075 BLAKE2B 1160f005c78fdb575695b73ca5e81e45c6312a9f3c928ce32f097b8d96075ed012610420872aaa247bf39c28ad1cdd27dde23582ba2708269b9576f5c7127326 SHA512 14f223e0f19cf0697529048f60b84324689983e5b2799d235e0257e2fdfe1e2698e2bbe5a32a90c372300f70869f4cd1f460d3731636a3b45f9424e3add3f2e5
-AUX specimen-0.5.2_rc3-underlinking.patch 2324 BLAKE2B 41887cd863ba7c46dd64e63a70affd945450d93ae4a0f762ee2abb9577a98956ceefc776be842799e3e46f09d80fdec9fe937ae0149e974733e1c4c347ac4f31 SHA512 012c0c08c2706ce11a97fb5a8919b9d72287119658a57151648aa7adf24b22ea6d552d18b4584c68a5077e236ae7653f8c54eaafac7b698015b5e93d9f5d587d
-DIST specimen-0.5.2-rc3.tar.gz 267948 BLAKE2B f7a19c80cfe03730a9eae56ad213ed79555bf0da80bafdc55b29a9316e2cf37e6178d0c452d13f6c6a3cdf700ec8e844c21b86dff32f4eeec305534cd00f8dd8 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4
-EBUILD specimen-0.5.2_rc3-r2.ebuild 985 BLAKE2B 0596dbb939e955938638d7ac4833c7fa6cd42c23079e31ad2bdac3c6f780675c5d487900d5d3c112f3294680a0b37dfd926346363fd3d499e91df14ac9d6661c SHA512 00c2065f36a1a14aefbf7c04a477a516b65d736a8f3ecd1d00f6ba931220a6b35cbed06fd8cb19e11eed1b690ca50b2a51029cbdf641043a4062296b5335777b
-MISC metadata.xml 469 BLAKE2B f079f7fa89d407784fc4c2503b933a1f2313349babbd0dc2cc373407dc92d650d6067f0203a88d5e390cd4ea21402e9b3a66cb86899978430dd7e47f4228b217 SHA512 ba825914f15f4a5451e943a8973361ed42cd2206c589fd087b1e5b4ae5b797c428fa47ef2ef6f0229b242bcd8f02a90bb5f0a01779e1bb0495cd0f8a5dd86335
diff --git a/media-sound/specimen/files/specimen-0.5.2_rc3-jackmidi.patch b/media-sound/specimen/files/specimen-0.5.2_rc3-jackmidi.patch
deleted file mode 100644
index 2e3cf2ba9125..000000000000
--- a/media-sound/specimen/files/specimen-0.5.2_rc3-jackmidi.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: specimen-0.5.2-rc3/src/jackdriver.c
-===================================================================
---- specimen-0.5.2-rc3.orig/src/jackdriver.c
-+++ specimen-0.5.2-rc3/src/jackdriver.c
-@@ -81,7 +81,7 @@ static int process (jack_nframes_t frame
-      jack_midi_event_t jack_midi_event;
-      jack_nframes_t event_index = 0;
- #ifdef HAVE_JACK_MIDI
--     jack_nframes_t event_count = jack_midi_get_event_count(midi_buf, frames);
-+     jack_nframes_t event_count = jack_midi_get_event_count(midi_buf);
- #endif /* HAVE_JACK_MIDI */
- #ifdef HAVE_OLD_JACK_MIDI
-      jack_nframes_t event_count = jack_midi_port_get_info(midi_buf, frames)->event_count;
-@@ -123,7 +123,7 @@ static int process (jack_nframes_t frame
-      /* send the JACK MIDI events to the mixer */
-      while (event_index < event_count) {
-        
--         jack_midi_event_get(&jack_midi_event, midi_buf,event_index, frames);
-+         jack_midi_event_get(&jack_midi_event, midi_buf,event_index);
- 	  midi_data = jack_midi_event.buffer;
- 	  
- 	  /* TODO: handle 14-bit controllers and RPNs and NRPNs */
diff --git a/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
deleted file mode 100644
index db0df85debd7..000000000000
--- a/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-* Remove hardcoded CFLAGS
-* Fix underlinking issues
-  - missing -lm linkage (sin)
-  - missing -pthread linkage
-    -> https://bugs.gentoo.org/show_bug.cgi?id=561562
-
---- specimen-0.5.2-rc3/configure.ac
-+++ specimen-0.5.2-rc3/configure.ac
-@@ -1,10 +1,10 @@
- # -*- autoconf -*-
- # Process this file with autoconf to produce a configure script.
- 
--AC_INIT(configure.ac)
--AM_INIT_AUTOMAKE(specimen, 0.5.2-rc3)
--AM_CONFIG_HEADER(src/config.h)
--
-+AC_INIT([specimen], [0.5.2-rc3])
-+AC_CONFIG_HEADERS([src/config.h])
-+AM_INIT_AUTOMAKE
-+m4_include([acx_pthread.m4])
- 
- # compilation
- with_debug="no"
-@@ -13,9 +13,7 @@
-         [enable debugging information, accepting a performance penalty (default is NO)])],
-     [if test x$enable_debug = xyes; then with_debug=yes ; fi])
- 
--if test x$with_debug = xno; then
--    CFLAGS="-O3"
--else
-+if test x$with_debug = xyes; then
-     AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]])
- fi
- 
-@@ -48,13 +46,14 @@
- AC_FUNC_MALLOC
- AC_CHECK_FUNCS([floor gettimeofday pow strchr strdup])
- 
-+dnl Check for libm for sin()
-+AC_SEARCH_LIBS([sin], [m], [], [
-+	AC_MSG_ERROR([unable to find the sin() function])
-+])
-+
- # pthreads
- ACX_PTHREAD
- 
--SPECIMEN_CFLAGS="-Wall -Werror"
--AC_SUBST(SPECIMEN_CFLAGS)
--CFLAGS="$SPECIMEN_CFLAGS $CFLAGS" 
--
- config_error="no"
- 
- # gtk			   
-@@ -122,7 +121,8 @@
-   fi
- fi
- 
--CC="$PTHREAD_CC"
-+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+LIBS="$LIBS $PTHREAD_CFLAGS"
- 
- # print build summary
- AC_CONFIG_COMMANDS_POST([
---- specimen-0.5.2-rc3/src/gui/Makefile.am
-+++ specimen-0.5.2-rc3/src/gui/Makefile.am
-@@ -12,14 +12,14 @@
- paramselector.c paramselector.h patchlist.c patchlist.h midisection.c	\
- midisection.h channelsection.c channelsection.h
- 
--INCLUDES = \
-+AM_CPPFLAGS = \
- 	-l.. \
- 	@GTK_CFLAGS@ \
- 	@LIBGNOMECANVAS_CFLAGS@ \
- 	@PHAT_CFLAGS@
- 
- if HAVE_LASH
--INCLUDES += @LASH_CFLAGS@
-+AM_CPPFLAGS += @LASH_CFLAGS@
- endif
- 
- libgui_a_CFLAGS = $(CFLAGS) -I.. -DINSTALLDIR=\"$(datadir)\"
---- specimen-0.5.2-rc3/src/Makefile.am
-+++ specimen-0.5.2-rc3/src/Makefile.am
-@@ -11,7 +11,7 @@
- specimen_SOURCES += lashdriver.c lashdriver.h                                                                                                                           
- endif
- 
--INCLUDES = \
-+AM_CPPFLAGS = \
- 	@ALSA_CFLAGS@ \
- 	@JACK_CFLAGS@ \
- 	@LIBSAMPLERATE_CFLAGS@ \
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
deleted file mode 100644
index 1de2a64a6516..000000000000
--- a/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_/-}"
-inherit autotools desktop
-
-DESCRIPTION="A Midi Controllable Audio Sampler"
-HOMEPAGE="http://zhevny.com/specimen"
-SRC_URI="http://zhevny.com/${PN}/files/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE="lash"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/libxml2:2
-	gnome-base/libgnomecanvas
-	>=media-libs/alsa-lib-0.9
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/phat-0.4
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	x11-libs/gtk+:2
-	lash? ( media-sound/lash )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-jackmidi.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable lash)
-}
-
-src_install() {
-	default
-	doicon pixmaps/${PN}.png
-	make_desktop_entry ${PN} Specimen ${PN}
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index cc5b74226063..efa272562563 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -4,4 +4,5 @@ DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9
 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
 EBUILD spotify-1.1.10-r1.ebuild 3155 BLAKE2B d3bc28ef679c0307add8cb7b496cedf3a47dededc46c624b9a14b4b2e31fd40fffaafca87f084519db86b33312fa6f30c64bb222acdbac99dcffee8cc537191b SHA512 5f9fb840160b3b5a11af49836f10735aac5d3cacf21f429e554b63d6b3d924401eb3f3d73b1ef0abeef5c2a1d74fe3be24a740f8a2eb2069c8b29b9f50fb07db
 EBUILD spotify-1.1.26-r1.ebuild 3193 BLAKE2B 35f3f47bdaeed4ce6b20b7d856f2b35b3c3930c4347edc807ab72fb9cc3b5a084729ec1223c10155f1cc2801210debd89785ebad819e9bcb265aea247f194520 SHA512 a5ca516fa5cbfcccfa7edd49a860487283e7a3feaf832f2f252291438468f2db3c8c1e855bc0d09d09ab36a995bb88298c3c321ce0ddafa66f23a64de2306553
+EBUILD spotify-1.1.26-r2.ebuild 3449 BLAKE2B 28e9a400ad3bf321efb845b7ad396bc399bda2aeb1c1a3acfdc0dbd1b747c971eb8b59c2c073b8126a0ae056e937cea6c32b4ebd648f0e753cc0a98db0e84618 SHA512 f9e16593cf0c5d8ea6c7f35f984e1a23cda928ec2ea7f2140c6635ee1e46aa80e7f1b0e6bcbd031416f92e8e60504dc07df0a8fd85b85552303086e1ed2f56b1
 MISC metadata.xml 542 BLAKE2B 112c082ca9d2775e0225eadf3ec24260438db4ec3122be340395edae3096f378ddb349275fe5c31435c5196d606d099812fea831d06ce2ac913ddc777e65d66d SHA512 a414c96da5c9c5af23491937a86edf26ca5207f4cd9277a187059f2196b8ce9b28cab80f0ee5a326911a9aa5945d2604bea310608bc5270e507fb8052e1bd2ef
diff --git a/media-sound/spotify/spotify-1.1.26-r2.ebuild b/media-sound/spotify/spotify-1.1.26-r2.ebuild
new file mode 100644
index 000000000000..fdf168b74773
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.26-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop pax-utils unpacker xdg
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="501.gbe11e53b-15"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify libressl systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+BDEPEND=">=dev-util/patchelf-0.10"
+RDEPEND="
+	dev-libs/nss
+	dev-python/dbus-python
+	dev-python/pygobject:3
+	libnotify? ( x11-libs/libnotify )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	media-libs/mesa[X(+)]
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-sound/apulse )
+	systray? ( gnome-extra/gnome-integration-spotify )
+	x11-libs/gtk+:2
+	app-accessibility/at-spi2-atk
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libSM
+	x11-libs/libICE
+"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="
+	opt/spotify/spotify-client/spotify
+	opt/spotify/spotify-client/libEGL.so
+	opt/spotify/spotify-client/libGLESv2.so
+	opt/spotify/spotify-client/libcef.so
+	opt/spotify/spotify-client/swiftshader/libEGL.so
+	opt/spotify/spotify-client/swiftshader/libGLESv2.so
+"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
index 4dbf9d5c6065..f9589b229102 100644
--- a/media-sound/tapestrea/Manifest
+++ b/media-sound/tapestrea/Manifest
@@ -2,4 +2,4 @@ AUX tapestrea-0.1.0.5-gcc44.patch 1301 BLAKE2B 09c05cdfef6860013d84a2833a77b3b69
 AUX tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch 1280 BLAKE2B 3910c1de8ad0fe14c80b9e347350924e71d1f2c10068287474a0262060d26d5f24558c51483af912dbd8fef4c0436e84af7108379955458d5b50619a9a8a8616 SHA512 de4ff80ba5ca256d794ceff80fe956459e16261b1d786a87691d2736835839e177056ab9e4732c78ec0381c01324c483b27de310f8168269ebc04dd6e39af344
 DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656
 EBUILD tapestrea-0.1.0.5-r1.ebuild 2757 BLAKE2B 864dc8a0f04d5dc6c1f8e273c4adb554bd80b70282642f6bdfbe464fe5bb7dd372b6ebf8fddd1407795fed7b81d6b31712c04b2a58825566fe27fca603fe1675 SHA512 950b9cad047bcd047ec4a2e8d210aaacc0cba55e9b542f1ad1272f293e94cb1b3c5b08550fb3260faa77995644530393cec6fa4a3ec959dc8c356ff5c25d8204
-MISC metadata.xml 269 BLAKE2B 2d564d4edcfea235f94683a6a208d7cd797d7f24d250c8b3f8c7e2b4e2f12137241bdcd09590f0059644caabad1b4b8b196b12d0601a88197e78af6d2d6c095f SHA512 5f48ad801d958dab1f3a4a877bc7681180c3a37b27bd602527c34c005d2f384466bc04c61dcd1f80e7463d7bdb3acb5f457fb02b1549c0e2de9dca7b8a203d1c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
index d6fe65967ae6..7a38bb900964 100644
--- a/media-sound/tapestrea/metadata.xml
+++ b/media-sound/tapestrea/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A set of new tools and techniques for sound design
-	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/tapiir/Manifest b/media-sound/tapiir/Manifest
deleted file mode 100644
index 45171492eba4..000000000000
--- a/media-sound/tapiir/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tapiir-0.7.2-ldflags.patch 422 BLAKE2B e3e838861126c228029c2cc0c3166c3a2262fb6710f8fadae4a1fb5c291b6e2edff6d62c3e7690d7957f144832b0bf44936790914995b9bd58e0b1c087b57961 SHA512 5141831956322ef1df0909bc5e55124cb6367eae7a043a826843a9363b95f7d75fed8e0439eef66a0b7e3aa982a19da83fba80687a8451f9b3ed272082414cbf
-AUX tapiir-0.7.3-acinclude.m4 4975 BLAKE2B a03e4e9ac57c70b014d0befcdccdd7b2b1f3cb0c39909185b0788f358968be0d82ff92242dbf1bbf7de19add69f507510cbb2ec502cfe68710d60022b67ef772 SHA512 b97e115a2c113280dc7c3c705a8b2e4270259c05a0379cf94b4709b2744e6aafba048ce1c6dc00ba2a01df6861308e244749881f0159508bea61d7c73faea640
-DIST tapiir-0.7.3.tgz 168651 BLAKE2B 28f8617fa19b5591d5d2bb4b10e36064907b8c5c7f195030ce87064ba5596a41ee98407a88e76835d3df5decec01fa72fdeaab473ae419717f7d876f085eeea7 SHA512 e9b935f775ddcaf9d6a2b963a1d002d400fc34220845122188b82f1d6075176afc195ae4320679d8990b57f71d0a44fb6ba0cee8a74cb732b92957596c13f4b3
-EBUILD tapiir-0.7.3.ebuild 860 BLAKE2B 8dd34b792422ec32cf86faa2dc7cdb3780c9b295822c16bfd00e5736e86b34fbd2bf614dac32ecec5997368a9f7a68af8760dc26bf96db3fd277b9bab8c8c765 SHA512 ddc51f88eda721f87d0e25c1a6d7ac10efce4d3e39739f9994fe98524326b375ed3483a4a93456078dbe1cd1c22e01163942df2497df98cd112f044f3299f6d6
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/tapiir/files/tapiir-0.7.2-ldflags.patch b/media-sound/tapiir/files/tapiir-0.7.2-ldflags.patch
deleted file mode 100644
index 27b616e9b263..000000000000
--- a/media-sound/tapiir/files/tapiir-0.7.2-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: tapiir-0.7.2/configure
-===================================================================
---- tapiir-0.7.2.orig/configure
-+++ tapiir-0.7.2/configure
-@@ -3667,8 +3667,8 @@ See \`config.log' for more details." >&2
-    { (exit 1); exit 1; }; }
- fi
- 
--CXXFLAGS=`fltk-config --cxxflags`
--LDFLAGS=`fltk-config --ldflags`
-+CXXFLAGS="$CXXFLAGS `fltk-config --cxxflags`"
-+LIBS="$LIBS `fltk-config --ldflags`"
- 
- 
- ac_ext=c
diff --git a/media-sound/tapiir/files/tapiir-0.7.3-acinclude.m4 b/media-sound/tapiir/files/tapiir-0.7.3-acinclude.m4
deleted file mode 100644
index 9442a32c8566..000000000000
--- a/media-sound/tapiir/files/tapiir-0.7.3-acinclude.m4
+++ /dev/null
@@ -1,173 +0,0 @@
-AC_DEFUN([AM_PATH_ALSA],
-[dnl Save the original CFLAGS, LDFLAGS, and LIBS
-alsa_save_CFLAGS="$CFLAGS"
-alsa_save_LDFLAGS="$LDFLAGS"
-alsa_save_LIBS="$LIBS"
-alsa_found=yes
-
-dnl
-dnl Get the cflags and libraries for alsa
-dnl
-AC_ARG_WITH(alsa-prefix,
-[  --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)],
-[alsa_prefix="$withval"], [alsa_prefix=""])
-
-AC_ARG_WITH(alsa-inc-prefix,
-[  --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)],
-[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
-
-dnl FIXME: this is not yet implemented
-AC_ARG_ENABLE(alsatest,
-[  --disable-alsatest      Do not try to compile and run a test Alsa program],
-[enable_alsatest="$enableval"],
-[enable_alsatest=yes])
-
-dnl Add any special include directories
-AC_MSG_CHECKING(for ALSA CFLAGS)
-if test "$alsa_inc_prefix" != "" ; then
-	ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
-	CFLAGS="$CFLAGS -I$alsa_inc_prefix"
-fi
-AC_MSG_RESULT($ALSA_CFLAGS)
-
-dnl add any special lib dirs
-AC_MSG_CHECKING(for ALSA LDFLAGS)
-if test "$alsa_prefix" != "" ; then
-	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
-	LDFLAGS="$LDFLAGS $ALSA_LIBS"
-fi
-
-dnl add the alsa library
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
-LIBS="$ALSA_LIBS $LIBS"
-AC_MSG_RESULT($ALSA_LIBS)
-
-dnl Check for a working version of libasound that is of the right version.
-min_alsa_version=ifelse([$1], ,0.1.1,$1)
-AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
-no_alsa=""
-    alsa_min_major_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    alsa_min_minor_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    alsa_min_micro_version=`echo $min_alsa_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILE([
-#include <alsa/asoundlib.h>
-], [
-/* ensure backward compatibility */
-#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
-#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
-#endif
-#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
-#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
-#endif
-#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
-#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
-#endif
-
-#  if(SND_LIB_MAJOR > $alsa_min_major_version)
-  exit(0);
-#  else
-#    if(SND_LIB_MAJOR < $alsa_min_major_version)
-#       error not present
-#    endif
-
-#   if(SND_LIB_MINOR > $alsa_min_minor_version)
-  exit(0);
-#   else
-#     if(SND_LIB_MINOR < $alsa_min_minor_version)
-#          error not present
-#      endif
-
-#      if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
-#        error not present
-#      endif
-#    endif
-#  endif
-exit(0);
-],
-  [AC_MSG_RESULT(found.)],
-  [AC_MSG_RESULT(not present.)
-   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)])
-   alsa_found=no]
-)
-AC_LANG_RESTORE
-
-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
-if test "x$enable_alsatest" = "xyes"; then
-AC_CHECK_LIB([asound], [snd_ctl_open],,
-	[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
-	 alsa_found=no]
-)
-fi
-
-if test "x$alsa_found" = "xyes" ; then
-   ifelse([$2], , :, [$2])
-   LIBS=`echo $LIBS | sed 's/-lasound//g'`
-   LIBS=`echo $LIBS | sed 's/  //'`
-   LIBS="-lasound $LIBS"
-fi
-if test "x$alsa_found" = "xno" ; then
-   ifelse([$3], , :, [$3])
-   CFLAGS="$alsa_save_CFLAGS"
-   LDFLAGS="$alsa_save_LDFLAGS"
-   LIBS="$alsa_save_LIBS"
-   ALSA_CFLAGS=""
-   ALSA_LIBS=""
-fi
-
-dnl That should be it.  Now just export out symbols:
-AC_SUBST(ALSA_CFLAGS)
-AC_SUBST(ALSA_LIBS)
-])
-
-
-AC_DEFUN(AM_PATH_FLTK,
-[
-AC_MSG_CHECKING(fltk version)
-
-min_fltk_version=ifelse([$1], ,1.1.0,$1)
-cur_fltk_version=`fltk-config --version`
-
-fltk_min_major_version=`echo $min_fltk_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-fltk_min_minor_version=`echo $min_fltk_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-fltk_min_patch_version=`echo $min_fltk_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-
-fltk_cur_major_version=`echo $cur_fltk_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-fltk_cur_minor_version=`echo $cur_fltk_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-fltk_cur_patch_version=`echo $cur_fltk_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-fltk_version_ok=no
-
-if test x"$fltk_cur_major_version" != x -a x"$fltk_cur_minor_version" != x -a x"$fltk_cur_patch_version" != x; then
-  if test $fltk_cur_major_version -eq $fltk_min_major_version; then
-    if test $fltk_cur_minor_version -ge $fltk_min_minor_version; then
-      if test $fltk_cur_patch_version -ge $fltk_min_patch_version; then
-        fltk_version_ok=yes
-      fi
-    fi
-  fi
-fi
-
-if test $fltk_version_ok == yes; then
-	AC_MSG_RESULT([ok])
-else
-	AC_MSG_FAILURE([not ok])
-fi
-
-CXXFLAGS=`fltk-config --cxxflags`
-LIBS="$LIBS `fltk-config --ldflags`"
-])
-
-
diff --git a/media-sound/tapiir/metadata.xml b/media-sound/tapiir/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/tapiir/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/tapiir/tapiir-0.7.3.ebuild b/media-sound/tapiir/tapiir-0.7.3.ebuild
deleted file mode 100644
index b0640c8448a1..000000000000
--- a/media-sound/tapiir/tapiir-0.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A flexible audio effects processor, inspired by classical tape delay systems"
-HOMEPAGE="http://www.resorama.com/maarten/tapiir/"
-SRC_URI="http://www.resorama.com/maarten/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-RDEPEND="
-	media-sound/jack-audio-connection-kit
-	media-libs/alsa-lib
-	x11-libs/fltk:1
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-ldflags.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
-	eautoreconf
-}
-
-src_install() {
-	local HTML_DOCS=( doc/{*.html,images/*.png} )
-	default
-
-	doman doc/${PN}.1
-	dodoc doc/${PN}.txt
-
-	insinto /usr/share/${PN}/examples
-	doins doc/examples/*.mtd
-}
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index c14dd2afe4e9..b9703fbe5e7a 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -4,4 +4,4 @@ DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae44630
 DIST upmpdcli-1.4.2.tar.gz 477650 BLAKE2B 8bc2f86e8821aaee29f969e6031553f29e3224fdaf4b9c7d443f55bda5f321f36607dbb7dc0af15f0d1e7b006e93595cd1d668f9d1975e8673a80b218ea7f570 SHA512 be855214b55686422689ce786103ff50748a9f9e7e556c8dbeaa7e39e0229a3e0b56502bdbeb7071771706416cd2ff36592cb5245b505d8438f0ba75c200e9c2
 EBUILD upmpdcli-1.4.0.ebuild 1259 BLAKE2B f62c3642b43df9d6d6d78001d0c45aec8b3fc1e5be2fbf5843ec3a6c20f4c500a18f367c6c5abd687482d88a5e39f86d98c30f635e3d8508cc21bc6123a0f81b SHA512 6e97ea302f73f8a3f7ce05d92f06cfe5d7f0fbf9a6b872e271000392d0bd8dd8fdb4cfa96c72beec1c56f94fa7fd31531d393b77f71ab8920c4fc578ec4d9fb1
 EBUILD upmpdcli-1.4.2.ebuild 1261 BLAKE2B 022363689427e8477865e2b6e9dd21614a706447698d80b736e2e01d0f0fb137e1ff85950465f42f5edbe863bb9399241872c5c34caeaef2627f7c8a659ce6a5 SHA512 a7f2d8874e4fac75c628341b00b980a523f58b50b4696500ce0d772c2e7445b42531698e586d3b75d1f15a05f323a32d33f9ef1d8dc4c7501addca52075589f5
-MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
+MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/metadata.xml b/media-sound/upmpdcli/metadata.xml
index 8d5234640e01..49bf49af07ac 100644
--- a/media-sound/upmpdcli/metadata.xml
+++ b/media-sound/upmpdcli/metadata.xml
@@ -4,9 +4,6 @@
 <maintainer type="person">
 	<email>stasibear@gentoo.org</email>
 </maintainer>
-<longdescription>
-	UPnP Media Renderer front-end for MPD, the Music Player Daemon
-</longdescription>
 <use>
 	<flag name="thirdparty">
 		Enable streaming from Qobuz and Tidal external services
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 8cd786e8c762..8aa845a15743 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,3 @@
 DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
-EBUILD vmpk-0.7.2.ebuild 848 BLAKE2B c3f0cb551fd71c6f14335189b9c2d7904b931abd63e2acaae9041548805e5d60c42357561a762b081bb43c40a4ce275bc89bb047a8c1b895284e589c5cc3104b SHA512 f74f22b0f41c3f75077e2dadfefb0cbd13b2e1cbf64a1dee59f7ec649a7907f56e48c4db944e59537df3c8ff8b82f9a23aa291ad31cf4be6db1d5ce51f9235e1
+EBUILD vmpk-0.7.2.ebuild 847 BLAKE2B ed6edfef3cd34a349208c01b2aa7c967f2ecbcab910b497fa72c137b73161349f442a069fe976ff40fa139c378296061fb2af9a8652306396dff71ebe21751d7 SHA512 10d0cd6186d6eed5832c7dcbb3deb0e0cad1f461d8f371e79140fe8feab8d0885e2493f3842384b8b6a6bfbacb6ac7c18049a0b41e4d784351da4fdd7310d41a
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.7.2.ebuild b/media-sound/vmpk/vmpk-0.7.2.ebuild
index 12365dd4917c..d8fd8a69c85f 100644
--- a/media-sound/vmpk/vmpk-0.7.2.ebuild
+++ b/media-sound/vmpk/vmpk-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="dbus"
 
 BDEPEND="
diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
index 36febee233e2..30fced260b54 100644
--- a/media-sound/yarock/Manifest
+++ b/media-sound/yarock/Manifest
@@ -1,3 +1,3 @@
 DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00
-EBUILD yarock-1.4.0.ebuild 971 BLAKE2B a01418972cf0a4273b88c0439e23ce6133de02b7dc4f7f5fd261ee0bb68012245182da4991826833712a8d1bc0d2c82fbb4d8fd82c433262ca6c72064eb71e49 SHA512 0676e1046ef453f9e1d57e7d3cd8dfafd35ea79c2892166439d0b87f70a99c49b603c866e3b7166159829c63b5a31bfad83e8c7b6decfbbb0be30ac8086f9a74
+EBUILD yarock-1.4.0-r1.ebuild 1174 BLAKE2B 73bb94d1dd2c5af1c52f3670b13f4fe8eba5859453ea8604ac767624c5e5d0ea8ce687a462b1d2f2620a2b9e1ab3d743db6508bcf8c7bb439a63b7d77442b305 SHA512 c89d3df001fa613ca78a9edefe74bdcacce6f89f1ff7ac87e35ac39c3a5b2507c919392c301c912b81a3aee5b6f9efb4d88d7039410d7904a1c47b824ce705c3
 MISC metadata.xml 477 BLAKE2B 8f41c22740fb729d50042c0e06585fef7bfc1d17333d2a76357d11fe898d6b8deaebeba2b9c8f4242b6db8997d9f4c5b6661eff9a29b84d196f5295d32620e8e SHA512 17dbd3112993095260668fd1aa35dac9928ee1e44d2dac722ff78a6d901c21e15f586ffe0986f02c8c071ec3770bbd084cdb4448cb3cf6c01bb9d723f8f66a2e
diff --git a/media-sound/yarock/yarock-1.4.0.ebuild b/media-sound/yarock/yarock-1.4.0-r1.ebuild
index 27284bd85984..39414485b05d 100644
--- a/media-sound/yarock/yarock-1.4.0.ebuild
+++ b/media-sound/yarock/yarock-1.4.0-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
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-libs/taglib
 	x11-libs/libX11
-	phonon? ( >=media-libs/phonon-4.10.1 )
+	phonon? ( >=media-libs/phonon-4.11.0 )
 	vlc? ( media-video/vlc:= )
 "
 DEPEND="${RDEPEND}
@@ -41,6 +41,14 @@ DOCS=( CHANGES.md README.md )
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*org.yarock.appdata.xml/s:share/appdata:share/metadata:" \
+		-i CMakeLists.txt || die
+	sed -e "/^Version/d" \
+		-i data/org.yarock.desktop || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_QT5=ON
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-sound
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)