gentoo christmass resync : 25.12.2020

34 files changed, 519 insertions, 297 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1335c74b09f2..9d1bd333fdd1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 9f0cb163810d..94b48475c227 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -4,6 +4,7 @@ AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d21898542
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
+EBUILD csound-6.15.0-r100.ebuild 7227 BLAKE2B b379e29cf689562d0b4699c125f1bb77849c926902adc4479717b4b9f3c697dc42d1eaae69e885bc8d56262729f60e1342ca42dc4802dcafbadc1e57e7570ac8 SHA512 c3e1b66f672493c4ccb6133c45abc776a4b9ea764955b3c079f419e99ad3be4101ffb6053f066e53d756969f6999912824968ac0e6c1122498627106d0baba3b
 EBUILD csound-6.15.0.ebuild 7354 BLAKE2B dbbf46fcfc64cb104696278cd59881c00da45d945a1b52239e8ee9e608bcb1df0b9344615d05b005120ff47fbfabd4bad18c66df8c29a3418018c3ef03296e1c SHA512 48cafb98a4646d7b56929bdb44ff0bb6ff6abbd1b47e99f460dc7151cbe0cccc3bc57db1d04ae94c2ad44a46823a2a347957ee6d4c655c90650cc90bc4784694
-EBUILD csound-9999.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1
+EBUILD csound-9999.ebuild 7227 BLAKE2B b379e29cf689562d0b4699c125f1bb77849c926902adc4479717b4b9f3c697dc42d1eaae69e885bc8d56262729f60e1342ca42dc4802dcafbadc1e57e7570ac8 SHA512 c3e1b66f672493c4ccb6133c45abc776a4b9ea764955b3c079f419e99ad3be4101ffb6053f066e53d756969f6999912824968ac0e6c1122498627106d0baba3b
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild b/media-sound/csound/csound-6.15.0-r100.ebuild
new file mode 100644
index 000000000000..93b965bc7303
--- /dev/null
+++ b/media-sound/csound/csound-6.15.0-r100.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound${PV}"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+# java doesn't work atm as it needs to have some variables specified to work, see src_configure
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+#	java? ( cxx )
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+# currently not used deps due to some issues
+#	java? ( virtual/jdk:* )
+CDEPEND="
+	dev-cpp/eigen:3
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
+	image? ( media-libs/libpng:0= )
+	jack? ( virtual/jack )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( =sci-mathematics/gmm-5.1* )
+	lua? ( ${LUA_DEPS} )
+	mp3? ( >=media-sound/lame-3.100-r3 )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+	"${FILESDIR}/${PN}-6.15.0-lame.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FAUST_OPCODES=OFF
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=OFF
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
+
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		-DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	#use java && mycmakeargs+=(
+		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
+		#-DJAVA_AWT_LIBRARY="?"
+		#-DJAVA_JVM_LIBRARY="?"
+		#-DJAVA_INCLUDE_PATH2="?"
+		#-DJAVA_AWT_INCLUDE_PATH="?"
+	#)
+
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
+
+	use python && mycmakeargs+=(
+		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index b52669444ab9..93b965bc7303 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -7,8 +7,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit cmake python-single-r1 toolchain-funcs
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -30,13 +32,13 @@ LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 # java doesn't work atm as it needs to have some variables specified to work, see src_configure
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
 vim-syntax websocket"
 
 REQUIRED_USE="
 	linear? ( double-precision )
-	lua? ( cxx )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
 	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 #	java? ( cxx )
@@ -45,6 +47,7 @@ BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
 	python? ( dev-lang/swig )
 	nls? ( sys-devel/gettext )
 	test? (
@@ -74,10 +77,7 @@ CDEPEND="
 	jack? ( virtual/jack )
 	keyboard? ( x11-libs/fltk:1[threads?] )
 	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua:0 )
-	)
+	lua? ( ${LUA_DEPS} )
 	mp3? ( >=media-sound/lame-3.100-r3 )
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
@@ -107,6 +107,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
+
 	if use python || use test ; then
 		python-single-r1_pkg_setup
 	fi
@@ -200,24 +202,12 @@ src_configure() {
 		#-DJAVA_AWT_INCLUDE_PATH="?"
 	#)
 
-	# set the library that we want to use
-	if use lua ; then
-		local libdir
-		local libname
-
-		if use luajit ; then
-			libdir=$(pkg-config --variable=libdir luajit)
-			libname=$(pkg-config --variable=libname luajit)
-		else
-			libdir=$(pkg-config --variable=libdir lua)
-			libname=$(pkg-config --variable=libname lua)
-			[[ -z "${libname}" ]] && libname="lua"
-		fi
-
-		mycmakeargs+=(
-			-DLUA_LIBRARY="${libdir}/lib${libname}.so"
-		)
-	fi
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
 
 	use python && mycmakeargs+=(
 		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 9004978daac3..ecfebac70f82 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,8 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-48-makefile.patch 1886 BLAKE2B 091197f5d2bd421be5ebd2a6d9dc90d5a6f34a65c2e26bf3b639312b15017b61162922ff3834f3f00a7ad098eff2397ad312057c0ba712d0e9a88a83973d3e97 SHA512 f451ccdfdc7c17b975a3b0077bb92f5131c9e22bb9bf224d3b991c3e61679dfc602642311f05b47ecb0ad0963d554467e697e4ec0b15f775af93e9d3299d3369
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
-DIST din-48.tar.gz 3673917 BLAKE2B 90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1 SHA512 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
 DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
-EBUILD din-48.ebuild 1076 BLAKE2B 5fc293baa092bfe143a36ea2b46c8765e10add99708f628878eefd549f5d9a0fec9d4b8f1df5a1e88f8d8ec35d2a60b91b81802364166a5a7b2262a734fb67a1 SHA512 6d54111f3e24d870cb93996502989da83a7c2012680d35476e01056910b00ab1e651870bee1c9c5dfc4ab10ee105a0fd1d79dde6ec9a03fbf9b5ff6a1189d885
-EBUILD din-49.1.ebuild 1081 BLAKE2B 80438b401f1556255c5b4bdf591317ef3c2c0bc92e7521fdc97aef7fa4101444d72ac1a31976fb9f511cc6d6c6a274ba64b3af738e802f5826b99f7d6335e1b4 SHA512 f662ed9a7ceaf0159570a36ed5c7f81d598907307a2cb8a5c2a677938b975013e5607dfb8f5f46dceae8f8541fb4e9c28dc756f0638fd9700a00dbf5a2cb3202
+EBUILD din-49.1.ebuild 1080 BLAKE2B 36e9fa12d77c754afe7bc74ba7ded2e2b30b6cda8dc2181b2348268499be0b015d3508420248918f80ddfbf4f6075eb54b39d574aff5f3c897073bafa27a5a2e SHA512 67bf71cc6c1ba1529173e992d79889627473163f74649fe694171fe3fd064d14aea4d17c78272e8409692299f4cc8f138dde535ca537f5b42e41d38a3cd8a369
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-48.ebuild b/media-sound/din/din-48.ebuild
deleted file mode 100644
index 5be0674fc55e..000000000000
--- a/media-sound/din/din-48.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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/din-49.1.ebuild b/media-sound/din/din-49.1.ebuild
index b88be5f2c753..6872627e7dcb 100644
--- a/media-sound/din/din-49.1.ebuild
+++ b/media-sound/din/din-49.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/din/files/din-48-makefile.patch b/media-sound/din/files/din-48-makefile.patch
deleted file mode 100644
index 5a37359106da..000000000000
--- a/media-sound/din/files/din-48-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 05820d4e7b76..94675d38c543 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
+DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
 EBUILD gnome-music-3.36.4.1.ebuild 2045 BLAKE2B 6e3adace7160f1aa9a1d6ad9d3c36158326e3c055ac21a7c465e4e2d31e35c1ad06d001a21519b32fc745e56eec137d1533de54351dd267be3ed3476c15b29ac SHA512 817d8419483d631160fcf4bead6a54b6505f00422d2feba1445a8153ae29a94ba1cde7729117065d545d6148fcae6d68542016f79caf111be9e911feab113017
+EBUILD gnome-music-3.36.7.ebuild 2047 BLAKE2B c00989998335746d9afe6e9a81094a4d6af3e9e3b8972cc5c0822fe47d380ee6ebd267cc18c40c2c2cf090c33d4794577d21359afe67123013eea5cf332cede7 SHA512 e3ca6d511b0865946eb4f9193f2dea40344ac730782fa6a891bbeb599fba6c5844acc3dc5b9e63570b3b92e55cc9453bca3be2ffc0bf88f7cafd5af011273887
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.36.7.ebuild b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
new file mode 100644
index 000000000000..333450fc479b
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	>=net-libs/gnome-online-accounts-3.35.90[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.24.7:3[introspection]
+	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=app-misc/tracker-2.3.0:=[introspection(+)]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.12:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.10:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		>=app-misc/tracker-miners-2.2.0[gstreamer]
+		>=app-misc/tracker-miners-2.2.0[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index 580c9583f249..becc1949349f 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -1,3 +1,3 @@
 DIST id3v2-0.1.12.tar.gz 121476 BLAKE2B 421e95211048a6e17559736aadee2b40b4c817373f83790a23b4206aa2715ef8473bc9ae83dad480b1edac29cfe20cb8686f2d78773a2929c5f9c97bf4e718ea SHA512 f9c74ab6ffbb50ab7ae7af64dcde78a0766bcbf71308d4c9fb480543b5790e2690ae096d6a2ecaffb01b7497a18841b5235500177cf5eaa8e668cf443abc726a
-EBUILD id3v2-0.1.12-r1.ebuild 537 BLAKE2B 8eccd112733d597bec1780524c138cfb583e5c3bc8862d1d6e01d904f5040b35cabd73e37bce8bc7e6e6c77f04efcbd226427bca4955b7186575c6e065e23217 SHA512 484fa9c360f0a263e3ce50783157f612fb2fd2610cda1fd5e99b7491a2eac77d00df452f0045d5e970c80c9ed8e8efdadfc07ad5b2e392fbba4d2bcc59b9b349
+EBUILD id3v2-0.1.12-r1.ebuild 534 BLAKE2B 05444ad82510a078adda3f363065bbd02303a4dd545fa9e401ca1e6a4e311b53078ed40502b68dd5ff10684187ac82fe37655b28400df28ed9972fb6fc0f998e SHA512 663448b5e863594d112e0c451142c1dfb9a05e2f64d5b58ce683fb18ffd3cbae1e0f84d2643b2dadfc909ff8369a36b7d7618ad607c1c6a1608457ee9162871e
 MISC metadata.xml 328 BLAKE2B 42e0653aa87bd9f00be18dcdeac17ccbb61d5a6e1399d8a246f2b2745431f84f81175a61d77780899bcd48868c9f66df8e93d7a89ae6660151cd768a45560881 SHA512 d813858c55feb67797a7c5226debd484291e153994ebfe42a3038690c6fcc18a2b70ec0324fec1fba2a8eadb49fadeee419f279c7ea105a355eedb8178e615bd
diff --git a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
index c0fde2319c97..40c4ac809079 100644
--- a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index e4216c4235b0..37dda7ed9c26 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,4 +1,4 @@
 AUX jalv-1.6.4-qt-5.7.0.patch 462 BLAKE2B 54918c977485c0c420a3f23dbcbf4638def779429b6bd7065c79b0ddffc0263b1a65402b3ec0a7d8678f0ccba694a758d211d9d5fc589b6723cd728bcb4d29ff SHA512 048352f5355aa957a6d88026374555a9dc4b33a4aef972fa39de5ca772b1ca77298f81ae938482d43a41da513594255ae37c57bd2a3b70fe6b22b03f46d80ea7
 DIST jalv-1.6.4.tar.bz2 346053 BLAKE2B 15f2a94d2b7809f865ee38c6e872ecb32e7c3aa856ad733a3c06e372bf3d3b6c5e434397fe325a8d336e0ef3f0786f4bd2beb14259945b2b1356a48f956a10b1 SHA512 bef75f422cae7d536e0caa620ea47872277e42001044a2682deb2c1aa3ecd8fc51056b4a49a950cbd04c6694751579f9932e7dd0f7868f9825ccc2d8e2110c1b
-EBUILD jalv-1.6.4.ebuild 1362 BLAKE2B df91b4019bd9d7bb182dc726a058a1538efaeb798d40490e3d2ddd6fe62b36d13b29c297f1c2b5e90efd52ed6d5c91e0dd47626afedaa8ae6c583e73dc378bee SHA512 fffa6299920c0cc0a98664a4be701826a15a4a32263c9cddae546c148a2051ecddb907b3569294764a00f1fd5be591e1c84031ecb5faf2f22f1fe6bbdc38cb30
+EBUILD jalv-1.6.4.ebuild 1373 BLAKE2B b95bded49313b612f5305ddf54c2f9f05d62855746f3e841cfd695a340c262898c3e845528365ef8504c937a456abcff3bd1e50da030d2eb7de4b880655a330f SHA512 12dd1be5594957fc4c8ff908da04f56ddaf478ce90ad71366f20b3d2610b118ebd3420acdc7c8baa8a18b1898d37c6b4f3f1077ba8d17f3d25d754482bf8bed6
 MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
diff --git a/media-sound/jalv/jalv-1.6.4.ebuild b/media-sound/jalv/jalv-1.6.4.ebuild
index 1a2a254f6300..d162740d5e99 100644
--- a/media-sound/jalv/jalv-1.6.4.ebuild
+++ b/media-sound/jalv/jalv-1.6.4.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
-
 inherit python-any-r1 qmake-utils waf-utils
 
 DESCRIPTION="Simple but fully featured LV2 host for Jack"
@@ -35,15 +34,14 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS NEWS README.md )
 
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.7.0.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.patch" )
 
 src_configure() {
 	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
index 04f27fd4f71c..3f0790f9060f 100644
--- a/media-sound/marrie/Manifest
+++ b/media-sound/marrie/Manifest
@@ -1,4 +1,4 @@
 DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b
 EBUILD marrie-0.4.ebuild 891 BLAKE2B 25c3c89709bf3a3d9513341a844302ac0c70382c5c5cb7f5734718c4e457a6d657be36ac60a1dfad77738d17bbe3f630ab5cd7f0024c04a72309a388300c322f SHA512 df45a2fae94dab5fc27feaac9adbe4303319edd897a569fb00d6ea2db6738e2ffda2a95c5ad7ef32537a5b1a3dcadd7b674675ca3c68847e137f18a0f005e7b1
 EBUILD marrie-9999.ebuild 891 BLAKE2B 25c3c89709bf3a3d9513341a844302ac0c70382c5c5cb7f5734718c4e457a6d657be36ac60a1dfad77738d17bbe3f630ab5cd7f0024c04a72309a388300c322f SHA512 df45a2fae94dab5fc27feaac9adbe4303319edd897a569fb00d6ea2db6738e2ffda2a95c5ad7ef32537a5b1a3dcadd7b674675ca3c68847e137f18a0f005e7b1
-MISC metadata.xml 569 BLAKE2B ea1c6ebe3f298e3dbed792c9bd0f95e6ce147f242aca7495d6ab87ee6850e0fbd1195b88b8fc341a11344f8662c0a49387826eeef67a5ddefe97391ed3898a3f SHA512 29d513b17b49e83d2ab52e5872f94d5a626e8d744faa876dda08932be0f06003f30153712634adbef8313c7c1e7b8d6c58912e84aaeca883b0a479033409b365
+MISC metadata.xml 479 BLAKE2B 0ddc1860004de05f492636bd0a7b57e683ee07be026a4b5509d4e2c959e4a9d6b3114fec0dc5ffdc958f8b4359fcb9ad09156f2b20a23f5613a308949746827d SHA512 e4df2008d83fe62532c1a1b03d4058aa7d4f7b67024aaf34d5c5d76aaf32baf01f56d90c5864fb4b3787f3828addbd75fba79b4dfb63149bd4eb3e046ad0ce87
diff --git a/media-sound/marrie/metadata.xml b/media-sound/marrie/metadata.xml
index 60b6d1b485e4..2e59b5ed0d01 100644
--- a/media-sound/marrie/metadata.xml
+++ b/media-sound/marrie/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>rafael@rafaelmartins.eng.br</email>
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 273ddef90a0c..7f1f34be3fa0 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,9 +1,7 @@
-DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
-DIST mpg123-1.26.2.tar.bz2 1047437 BLAKE2B 31b3434968fe48c81f599a9aa23557937ac71ed485c6c933f40f1ef2fdfaabcf8c34059de7f62e163286036db987932b6fcbf4f63f752c64659c9b9a805cf63c SHA512 aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9
 DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
-EBUILD mpg123-1.25.10-r1.ebuild 2840 BLAKE2B b5fc0883aef5242b4cddfc142cb6eaea54b11a3cac3ae4ee891e32bbeda4abfda304bb76c2c55dc2d88aadbd3555e2b2639a09294d40114e432403af75c956e8 SHA512 321fbcaf8be4780387f8af4451bb8c18863c64cd8686596d9657738be8cf5a76ecc4fedc89ecd1380bd7f671ac669800ab56f889305ca3d504808dd5081481f9
+DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
 EBUILD mpg123-1.25.13.ebuild 2882 BLAKE2B 6df742a1cda39743d832103757aa2792896122bf9aeb32b9ed057f7aa633069fe561cf07b1758ddbc82cb5894bcb5aa1252ac149a9d92560b653423ef7173ab2 SHA512 d5ee996bc7d276f9fc9440b85a9c8dc3a46b8b36b9b4ad3244ed89e10dc3b38dee78caa692c05d3ee81ba9c7762fbf7d8abbcc5ada6f318d3a335278d2159347
-EBUILD mpg123-1.26.2.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
 EBUILD mpg123-1.26.3.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
+EBUILD mpg123-1.26.4.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
deleted file mode 100644
index 817dafc63874..000000000000
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	elif use x86-macos ; then
-		# ASM doesn't work quite as expected with the Darwin linker
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=""
-	multilib_is_native_abi || myconf="${myconf} --disable-modules"
-
-	ECONF_SOURCE="${S}" econf \
-		--with-optimization=0 \
-		--with-audio="${_audio}" \
-		--with-default-audio=${_output} \
-		--with-cpu=${_cpu} \
-		--enable-network \
-		$(use_enable ipv6) \
-		--enable-int-quality=$(usex int-quality) \
-		${myconf}
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.26.2.ebuild b/media-sound/mpg123/mpg123-1.26.4.ebuild
index 0b76cb7da365..0b76cb7da365 100644
--- a/media-sound/mpg123/mpg123-1.26.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.26.4.ebuild
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 5ff02111e013..b4df00f0eb78 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -3,6 +3,6 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 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-1.3.3.ebuild 3815 BLAKE2B 3eb4984ef93cb6ee08a851c5d4a1713703ffe6560b40dc4fc5bb13f186bff4029cd45ab599543ea0f0f907bc1db6166b697da2e87916d8bf73f3692a54b20983 SHA512 3edc9ceea6e1a69cd2a111312007178405e26fbaad6f42299e4940d4c2e879e2530483a1c3dc7234d5407923052f5e1551236f067a0a25bfd9212f60c826fee1
+EBUILD mumble-1.3.3.ebuild 3814 BLAKE2B f59c05d68a56cee5f840d6991718bf10cee2fe10bd70d78eeea5a87aea4ddf545c96807ccc52bb1c01615348695cdc166d94ebc6dd651042c0945337621f37a3 SHA512 7d7d42d1ce7b90b4f25522f4ea71696218b2b8c4addfc8f8c927ecfabf1493ab08d811136b24bfaeb708928d3b6e733e0f40c65103cc11ed87071e04bec12577
 EBUILD mumble-9999.ebuild 3057 BLAKE2B 8e2614ae3c594f82c09860adaf34a9186874d44e78faec04a3c209d50f13985c4930e6cba0c700a1d65265bb96e67b2b5767ea7d6e4ea819995fbc09e5a232a5 SHA512 6cdb85d603f3b1303e1caef0369dda4e7b7ed8e09a70a72ddd5eb1e33bd21f9ce11c87899dee90ca99b3b832252215ec182676ca4fe2ec9a2ac08e6f0b797254
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
index 48c7aff21f57..0da26f648ad4 100644
--- a/media-sound/mumble/mumble-1.3.3.ebuild
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -21,7 +21,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD MIT"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 9a7d3196c80b..9863aa13a50f 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -7,6 +7,6 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
-EBUILD murmur-1.3.3.ebuild 3689 BLAKE2B 26646b012d7c104a0dfec1f9829d1558c4a464b70bd6c906b7f32032a434a8e264a83c37ce6b63b581232acc9598d008e92915292de974ea7e9625e19c7eae19 SHA512 d8743685b61d4baa2bb72538dc3e05feb41c7bf7b01f76fa6a482eac5f5ca9906ba7aff4fd1fbed6d44117651f6f9eb72c5717d88e61065044ff78f93c9f7627
+EBUILD murmur-1.3.3.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404
 MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
index 18faea156060..606e4379065a 100644
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_PN}-${PV/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index cfb2ba0612f1..cd6c3756f9d9 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -3,9 +3,11 @@ DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990e
 DIST pulseeffects-4.7.3.tar.gz 2010399 BLAKE2B a77a24fe9f8708564b146d65eb10a0021a05f102bacd25ac137ce6a2d21017c4b5c68a57c5cb2345cc228280460f1163d5dbce038d3bd427829335c8aa78d9f4 SHA512 0170ae0fbc3f72120545657ad7013f81afb40a96224c690c41206b91ae7ac2637f17b19238ef7d8a9f21a361cb9e76a0e2bf83e84d1404cc69733e7ad156c3f4
 DIST pulseeffects-4.8.2.tar.gz 2000571 BLAKE2B 70627741b41ca28489ab2e7813936d7b37fa521d3c9a81fa651ee5999d9b162e924db11fb780db7a9fe2b032b4d8596166336e59f754ffd1746f57b0ad41a34c SHA512 14fc30486568fd6729280bf1197b2e2292ddba188d984559c0ffe7faff1a9550e58e776d6d5aade12a6057aa608a58e0eb60830fdcb18d783c22d5f971e6d616
 DIST pulseeffects-4.8.3.tar.gz 2029631 BLAKE2B f70e4528859b2bd46d660a790f3c763ea2b7ecde4826a257c4d6fa4c76154532659d22d8d60053bfe1b2c03d5ce2986b08475dc85cede283070dc9b9d2e167eb SHA512 afcc1bc1df8b26ef0ff3ad932d3cc4efd963fac3b7ab49c98f8a6c91971702723a3fff5bcd2b0d6921545922e782787c8cc98ea5f54875cb17c5d9670e5ac520
+DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
 EBUILD pulseeffects-4.7.2-r1.ebuild 1903 BLAKE2B 50882416becc1e4545bcef6dcf5a245465064aa11b876ff4191d79bcd8e0723fc01d05b76f5d4fb6930f2a330edb4644d4a0b63ad1083c589e7e93c400494a3d SHA512 1726d0a7c5135c9423c4d85613d4b3b90854452e25a51ca2ada570d9c502d923eb4ddf89c481dccb4ba12f4583f5b42d74efc7b0e59833fc104452d468c003bd
 EBUILD pulseeffects-4.7.3.ebuild 1853 BLAKE2B 39c86df9a5b0d56ed0ecf183bf47a7bc28ba4a7f89233249483ea9d49de0b3ff9982f33732b030f810317955f7fcc4fdbec53e8d0675abb42b293d0ddef956f5 SHA512 22100898b102036d3e8359430cac32b6256e97dfdb0284a144c5b89fe7415871da96d349da8724d8be7b70f107c3a6570b2070db242a806b177ece2ec2d00e6b
 EBUILD pulseeffects-4.8.2.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 EBUILD pulseeffects-4.8.3.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
+EBUILD pulseeffects-4.8.4.ebuild 1809 BLAKE2B 5494b4f6321de6d23d53b03c53d4c13af32506bc8590cdf1a19f81686f25657e507a8e7d798927fb7bf0644524c207bfe987a7a8f6a3aa7051a722aebac0a774 SHA512 3753055c7e014dab2b9bf5584e859a55232382e9cb447f0ec1488e9d387c1ccce21ed1b0d4a59ad3eaea46419cee31fd77fffdcb44f0c425ddeb3b28e47a3958
 EBUILD pulseeffects-9999.ebuild 1810 BLAKE2B 9f47206073da304a1d4d057da553541969189103c3eec02203b99ea419cae15cf1e497381eb550269903a51ee8bd3387d3efb6585278f66bed09f981720a53b5 SHA512 8984fdc86db5e6428c0fc3c37fa87708cd9d69d0ee29b83e34c0b0d697ba2f5b36fc9c6669b2c08e9e90105639c0fcf1c65a4b43a7be8dc2661f6a998e5e53e3
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild
new file mode 100644
index 000000000000..2da1d6c26e68
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.8.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+else
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41:=
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 3b63b0e49968..d0e0cc7e890a 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,4 +1,6 @@
 DIST qjackctl-0.6.3.tar.gz 1033664 BLAKE2B 98d80d0fea3db359b732fad14711352ba688e605b7225daad64d7df1dabf1d19e24b4d643581f1936afa0df0c84350cf5727686246bd8a850e09da969a228e44 SHA512 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b
+DIST qjackctl-0.9.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
 EBUILD qjackctl-0.6.3.ebuild 1137 BLAKE2B 0616937f3234b42d65432618a5cc680f3f60bf5976abae18d150629acfec3c0d2bfa1f85daf1275dd673d90185e33398be590b8ee3710f62a5521672c7584ad7 SHA512 7a1c88562d8a11da98dd492e13640d1dd99279f9f3075ca6f73dac0585535dd84a78cb565ef5fb85545fde1f764ac37aacd0aca231d8eca40c2e631f0731117d
-EBUILD qjackctl-9999.ebuild 1132 BLAKE2B e675b9c24d2b977e169778b9e42b22f916194c1e994c9d1ba1b6472ba4662f1043904f3130052b36dcf2ed6a16596cb7fe0f45e19044258409f1fed2fe58e201 SHA512 4e324f6923fdd1508b2c0515814191ccec6212234ae4994ffcdcb9beb6014e43985191c169b6441c88ff223dee53013483f2e1a3f841f1ec8eb497c6028bf680
+EBUILD qjackctl-0.9.0.ebuild 1139 BLAKE2B 9c19a21f674eebb33a0a02f4481f19c4c6af47669a3f45a6f121107a8f225f4202c59b92ed741e75067cf5fc1bf20dca8df21048f8add1eb22fa52715ad04f5a SHA512 8a4964eafbf9c342624474f856baab8ae30aaf0075e6a6b6ca43ca4b89c8ab641803b9eb49e259886d28e77c77e135bd2cbe8a8885a64efdf063446b5cd04eff
+EBUILD qjackctl-9999.ebuild 1190 BLAKE2B 07f1dd83705cd04140dfb771d32c03d8e81733d84ac5bf92e8d419d1fa1563357aaf0254fcac2fd776d7a59528dc5d0acd506daa2f5832dbc1909b35d5688ddd SHA512 4c5553ca1e7a4e9c79492d94281aa5c0a91680ed2fbe4fd356f05fbf72b717502b3d15648abfbcc7537b3703aab7db2c6c45ab361d6724d9b3022c1812b094f2
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
new file mode 100644
index 000000000000..f91e1e16e544
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+RDEPEND="
+	app-arch/gzip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local myeconfargs=(
+		$(use_enable alsa alsa-seq)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable portaudio)
+		--enable-jack-version
+	)
+	econf "${myeconfargs[@]}"
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
+
+src_install() {
+	default
+
+	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
+	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 1601c3b1ea75..55ceab1b20dc 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -54,4 +54,5 @@ src_install() {
 	default
 
 	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
+	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
 }
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 103220589abc..8992bcec40b0 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,6 @@
-AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 AUX qsampler-9999-Makefile.patch 701 BLAKE2B cc95a22d6e003d3b25993e2068e2101684a85da1b8ac47c35ae330dcebd9f72ab3cc2931f1ec840d484c3f1871c0991ab90d45e1744de9fabcec293a3e260f28 SHA512 7f582fa7103d77f79c14671551ffe9ce83ac4ac0a12ee76f5fd63a670d5838af6a2b7718b8de27946b8e1234081b7316fbc4837a94ceb28063797027f54cddb3
-DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
-EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004
-EBUILD qsampler-0.6.3.ebuild 1000 BLAKE2B 7bb7b8ef05cec4637340b639dfd562e2d16c0fae437aa987c50caccc62e8544d6c8b8cd33b4b1a5318acb395cd37cd8aa9d51a7236793b9aefa8e51601dc4274 SHA512 efdd00dd01f36a78e72f251a10e97816af5a18daa41135c488e8731e9a8fa93f8358088c41597b4426d33d319f5581a4df2d8f6f9c75fbe54b5801adfd55a27e
+EBUILD qsampler-0.6.3.ebuild 999 BLAKE2B 3799e7cf4eb2c7695e532e3e2dbb8790a8715937d74108f4a83367d4a885d965e9f3b2f2beba21b0ca587ba6219f30022807b887a260666e461e22a2580eb03f SHA512 2818e544b0b51e87812f60d0bf02a6033faff016ef2e0ed6574dbc599786329b0fa5ad637def0b1cb1787ac8ee17a39e3c40398ed2e22a8580a9e72473702493
 EBUILD qsampler-9999.ebuild 1072 BLAKE2B 756a2fa86b6e39d464018c6873017f8c914c59b08a9d3ae702af01fd20549daf7e2249591045b1a3ce6cdf6f3acf24f4be567749ee943c09a6fafd6dcbd8a2bd SHA512 9a58651e257148e1d13979573d036047acea54a60566dc2e979d7008b34e11e11e756220f816af0e70ca20facddef6869c615a3f30a7ea66d79443a56a0011cf
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
deleted file mode 100644
index 7f23e78b669a..000000000000
--- a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.in	2018-12-16 23:40:26.001395069 +0100
-+++ b/Makefile.in	2018-12-16 23:46:00.210638503 +0100
-@@ -109,7 +109,6 @@
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild
deleted file mode 100644
index ab5a0073a2c5..000000000000
--- a/media-sound/qsampler/qsampler-0.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-sound/linuxsampler-0.5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
-	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
-}
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
index 6cb59ab6dfc0..049457c6e582 100644
--- a/media-sound/qsampler/qsampler-0.6.3.ebuild
+++ b/media-sound/qsampler/qsampler-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +libgig"
 
 DEPEND="
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 7db2ab5fa087..89ae3c827fb4 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -8,9 +8,9 @@ AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497f
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
-DIST teamspeak3-server_linux_amd64-3.13.2.tar.bz2 9945659 BLAKE2B bb3d10e5824aab613b5713c86845ce86405de351ee8e1ab378b35b57da5458a007c3663bb5c70b8e02ab1c3554d1bb7c74a8df0535d47dff6ed15e5068a1e14a SHA512 40c8630ed05eb46cd3d1eb870f2ab66b185b68b9d3118789de99a2ad817e5cb38fdd9f1bc16607f850cc5f0823c3f306d7cb9ab544fe41e5a1fbc8cddd977d9b
+DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
 DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
-DIST teamspeak3-server_linux_x86-3.13.2.tar.bz2 9780711 BLAKE2B c6749062abd4d23aa86be0348f973b3a4cba85f990845f63a9b175545daa707e443b01699690994843480028b5f44797096b6624266756ca3ff00faf1e8003d2 SHA512 8ed1bd7aebcea214b33209d1330fd6f9701aeefd804d2e1d69d4219e15eea580ec5c2e492312065f9150f48629a7c86490519b37a8fb333d3632a76c56e31086
+DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
 EBUILD teamspeak-server-3.12.1.ebuild 3083 BLAKE2B 2790ceaad0373faf5fb5b6e7ebcb997590ac3916021efabedcd4573c5c785351a1c617e418b2075bc10545c79ca64106c4506bc3844d007dab4aa6add16deb86 SHA512 8c4f7e56d0b035946b02a236d1488be1f2052332012724ef0158f00e58c1c0a7a0b7037a59a838a283e905c72b9194de483c0633c5095097c5920c1307dbbab3
-EBUILD teamspeak-server-3.13.2.ebuild 3512 BLAKE2B b58690672fdab82da1f31cc1ca0707c7aec578719454bb80f141f9d996e512d20495bc5fe6a0c6a6b15176ab7c57af50c17deee6c85b905f2304aae44b05279f SHA512 a426856348012da8589a4d3c65c2fac8a87e1582a9aae66bf6176a67f3724e189e1f21187837cbc345ffbe4ed1e2d62058ffd6b39e109bce776d1cd32e4f226c
+EBUILD teamspeak-server-3.13.3.ebuild 3512 BLAKE2B b58690672fdab82da1f31cc1ca0707c7aec578719454bb80f141f9d996e512d20495bc5fe6a0c6a6b15176ab7c57af50c17deee6c85b905f2304aae44b05279f SHA512 a426856348012da8589a4d3c65c2fac8a87e1582a9aae66bf6176a67f3724e189e1f21187837cbc345ffbe4ed1e2d62058ffd6b39e109bce776d1cd32e4f226c
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
index 75790c371a7d..75790c371a7d 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild