gentoo resync : 27.03.2021

30 files changed, 222 insertions, 218 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0f538f1f2a3a..46e77f144361 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 6eada05f5839..04d5920b80c6 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,6 @@
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
 DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
 EBUILD ardour-6.5-r2.ebuild 4776 BLAKE2B 957265c747d35808bca1f4bb55e8aea7228bb5f4f2cc36d2516a990114924f2fb48160af3343125ad241d4d7796aabe0ae22e1da12933ee35d7362330d3dc331 SHA512 f8d58d2858d18860cfd129f617dc730ffa64491a3f4c3eafced05015e15720602b362c7e100c29d7514b0c47cf3d1419bee87ddd14fb5ab224a530c6dc3b6a04
-EBUILD ardour-6.6.ebuild 4786 BLAKE2B 01ecb43a3cb8ebe2cdcc25af1e880b118f7d64d5884bbb3397514816f33076c20d15e4b798a6fc8d8781900f8775154056930b87b5a13d588dde261f5a383af1 SHA512 81ab09a2043ca58cb8c01d7d6d07df49e9c7adfed9107a669e437c8555f69e39171aab389fb1dbe78dbc3ccf09e80602158f9473675836288e18039d762bc4c8
+EBUILD ardour-6.6.ebuild 4785 BLAKE2B ebdc896f8ab0e98223af0f0f7c838007eaf25406b6ef069ee3a983bc3d5fe929eca6cc3a7801dafef783d8579a791fd4f4096b34240cdd044d734ff10c2cb5e4 SHA512 0f85bbe81ffd388716ea4683e6f3377894076109305927d28570eab765c6084695cb1c85917eed34ee1007c9e4d67c13ba4af1b203491551f7c71ace7c856d69
 EBUILD ardour-9999.ebuild 4786 BLAKE2B 01ecb43a3cb8ebe2cdcc25af1e880b118f7d64d5884bbb3397514816f33076c20d15e4b798a6fc8d8781900f8775154056930b87b5a13d588dde261f5a383af1 SHA512 81ab09a2043ca58cb8c01d7d6d07df49e9c7adfed9107a669e437c8555f69e39171aab389fb1dbe78dbc3ccf09e80602158f9473675836288e18039d762bc4c8
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.6.ebuild b/media-sound/ardour/ardour-6.6.ebuild
index ceeb6768060f..94b4609a1c39 100644
--- a/media-sound/ardour/ardour-6.6.ebuild
+++ b/media-sound/ardour/ardour-6.6.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
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index d3b6d309a1f6..e31cb5bf097e 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,6 +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 2426 BLAKE2B eea8c5daf2650fd7fbe9b839d07f2012b13f7c3255fca64c56cf599121e33d5bb6c470599667b6605a84e4d3d386f9ddc1f8b0d51aee96a578f0362a3215f9f4 SHA512 858a65d48e69380c1e624577a061c9d47425c6c344efe54eeca564f6c6bafa7e66e504690ad638bc8546272427d7be7324ea71906285f7a27e1b1e69ddf9fed3
-EBUILD cadence-9999.ebuild 2397 BLAKE2B ad1007129e87f58f76c63a3b28cd9481eddd41ac900f2cc63a0491d511fabe9d2ee78bb2d513878cfda4f691f750b6f8e2825cf87b7ca199bc82626973e40111 SHA512 27452689eb446cf60752ab5e233cb0c7b73d181926af481f0d9a12aa61b5f1ac87054b779214c8af7ca63e51c08c3efd0a9f0f4026e700573dee8eccda9a8bed
+EBUILD cadence-0.9.1.ebuild 2415 BLAKE2B 12dabbd1b604defe7916c62df4064a71be89a9f80b0222026d1a29645a294a69e790bfc3ca87a829806dc0b43ac47fe6e2821ecea9b6ccb861db00cd30546532 SHA512 a55964b78752c56b49502210e7faf4b8415ce7ab1388295356b2ec5e56adcf4f96a1e102c118c88ab6a618c9eef689cf46e3bb39b48eb439e84a63531d341b59
+EBUILD cadence-9999.ebuild 2386 BLAKE2B e4a06c60b01d4c92997eefae89159e2d76b9a07a92b1047bbdba87c27a59078c7739a9d3fb19e611a70df287453acb97f50612e85b6446d96b05432979215864 SHA512 f0073bc05fd2ab1e3bcc7111b86dc73d10f88a79695da8454f03ddabb7341985caaed50e1a88061d896b715cdfe1f14e136b6636a18dc8f81313e281962a3341
 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 d69255ac5581..026f01179e6d 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,8 @@ CDEPEND="
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
 	')
-	media-sound/jack2[dbus]
 	media-sound/jack_capture
+	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
 	pulseaudio? ( media-sound/pulseaudio[jack] )
 "
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 6ff16d3177f8..d99be6470613 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,8 @@ CDEPEND="
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
 	')
-	media-sound/jack2[dbus]
 	media-sound/jack_capture
+	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
 	pulseaudio? ( media-sound/pulseaudio[jack] )
 "
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 76cef6664882..5149b422420d 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,6 +1,8 @@
 AUX kid3-3.8.5-tests-optional.patch 2531 BLAKE2B 47764202cbfdeb7f4d55619f883a6aa5af1d0ef5034280a80cbf668eb0770cc80568e69d5e46b4ea20cf97eec217b4558082441fde0912325decfcda35ebce3c SHA512 d42e4a1e1a56ce3caef480a8fe08155d21d89b5e869f4411776b61373c6900f14073b8803001b1a70bd89532da48553bb8cca4bf45fd34ec589d695c434bb220
 DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a
 DIST kid3-3.8.5.tar.gz 3181228 BLAKE2B 8e409c0697cc6045c0a1da4b19a8eae952bc63fa824e21aca19e6ad2130ef71a3fff2c25fa34078ea72e3cbd84459c77bbb616b1d1fb62d0f1023aa2fd6cfccd SHA512 d1f0bc91d50538c29807ddca2a039e758c58850d1224675a1674e3e1d89936bf80db34ffd3cf3678e1008eb600476ebb722ca78796eba2537defcc57664ff00c
+DIST kid3-3.8.6.tar.gz 3183673 BLAKE2B c862c1da05ed85ecce8b0c666ddb9e18bdcabafe569f62f3264ebf1e0b7b16c11d25a10e1b1e6cd395442500275f9ee73ef1f6225e049790a09eac68b811df06 SHA512 11613ea72b23a80473699c61141ae2eb9a76b47da87704cd673b70a65bb334bd8232d3a66a7ff2b7f552751145613dbcfb8dcf0746eebb9fa2bd45979f4ba5d4
 EBUILD kid3-3.8.4.ebuild 1782 BLAKE2B 6d0bab38a20dbd1c35869368f0f3ee9cc92489db759e2dd789cdd48ec176f06b3dcca310c7744c2c14fcbbe9992d21b815d34e99b8a57149207167e3068acb97 SHA512 2d5745d314c1977b4fa63e7211c68fb0960e6d51f9154eeac52796621c0bf1ed4a87c6f4d2a2b827b334167577f0d5641a6392d90df8b2ae4090ff7efcff4414
 EBUILD kid3-3.8.5.ebuild 2120 BLAKE2B 95486d3a308e69ccc39820cc07f3f0ddfdf97bffcdd2413c4456d56972d2b0ece0a7b04134121e8d32faf64e9d55fb58cddab90b603f56b293975800d45891a2 SHA512 c8071d090083209a70d461e7934ffa73cd3c3e5fdfe2275271df776ad989d068cea37ee1a1342f113ef63953b2d4ede33ba08711e1900ffd5c33f4c96c445ba1
+EBUILD kid3-3.8.6.ebuild 2006 BLAKE2B e62ef6dad5abb717ce4afb25b0d32f9414115d236bb7d39b0ff164f94a87fb87a0acf30ea9a5a7586a4817881d505bf07e5f4b2731217fb84aa679b23f41cd62 SHA512 c9d344709c60c736b0621fb1e248229d9a7844a4b4207ab804255ee03126e85c255f607bb5c05dfabcbd2848de9600709be6d7a4160f30228c51c5bf838af879
 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/kid3-3.8.6.ebuild b/media-sound/kid3/kid3-3.8.6.ebuild
new file mode 100644
index 000000000000..d68ab97e4739
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake kde.org python-any-r1 xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+RESTRICT+=" !test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		media-video/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index af65f4453bac..3048a8766972 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,5 +2,5 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1317 BLAKE2B 46bb18352a390bf6272ae4d1b93c67d03e7616d8f371a87be1e04952281299ad43eef406617fd66aa805a012024647aa0de5891ced930b0f3ac9016666c56b60 SHA512 e8047edffaa93e185d5c8e0f999b5d0abbf7e73862820bf5ec94d8c7d8f9acb7a1cf37e576c127f78e4ad4ff323e3da265f117d4453edc32e633062b11bce168
+EBUILD mac-4.11.4.5.7-r1.ebuild 1431 BLAKE2B a660310d218ab64b1e25be4047c45b4d33f466a418c1c6ccbeaaf7b2d892cec52f08a80a72ef333c4b50fb05b7802360f1d12eb7967edcf0b94ae3424f58f7b3 SHA512 d2c34553cefe1b326b7fc4ba68dc92dfafa783ebd79dcb0d3ad5ffdc899402a95ae256915d2f3b02ffb352710a5f80ae1d0b8cf5596f150e4365c8cf55138c0d
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 521c7ab667ee..121c906229be 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 MY_PN=monkeys-audio
 MY_PV=$(ver_cut 1-2)-u$(ver_cut 3)-b$(ver_cut 4)-s$(ver_cut 5)
@@ -39,7 +39,11 @@ RESTRICT="mirror"
 src_prepare() {
 	default
 
-	sed -i -e 's:-O3::' configure || die
+	sed -i -e 's:-O3::' configure{,.in} || die
+
+	# bug #778260
+	sed -i 's/tag=ASM/tag=NASM/' src/MACLib/Assembly/Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 166b0759083d..0ccc0495f10e 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,7 +1,7 @@
 AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608
+AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e42a4651785d6b9d1cacb554be166a7772c56fbfdc1b4165c6951c810e962a6b4dc24fe714eb739244490b9a975e79b1d67e82dec6 SHA512 642be986fb147aa81251ce9c3f86761ff9f24c61e84fd447e243da34b1e9058a94f27ef632144f01e3c989bc321346bdc543130fd090520fb3064668a8017110
 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-r2.ebuild 2248 BLAKE2B e74e11a9a71a95399bb7e4c802d14b3992a63a8a1c9a5386fe857fa2cc48b61c1851d41aae5c438cf7c65d8a54e2213c243953849220a61607b304580db50eba SHA512 bf4131162002fc37857ea0022f7304ef7d6f7bda45cd8ed96a1fd3d204ddbe0b1f4b3cb6a544a9661fe915d6144c07586812e9cc8926747c85148b97505b48b9
-EBUILD moc-2.6_alpha3-r3.ebuild 2309 BLAKE2B d64957278960b177987a702701a5519b30439da37c2b254f97b0fcbaa402159a5eb669d9bab35d4d2aa71dc636eba405905a4a40e9202e2a1e0d19058aa4dd43 SHA512 3299e36a66c407ea53df6d4e6a8cce0ee1493b4e07e585b9c6e0bdcdbfe49e4c2dd953b6d81e6faf0489346cb0a808e1ada04a3eeb07fcc325d8367da3812a74
+EBUILD moc-2.6_alpha3-r3.ebuild 2438 BLAKE2B 50bbaaff6f02794b7eb77a56caebc58dd13c19fec125e29a4011b030e03325c4452ed156f1d5d2368665f30af5d81e89f51f9c5a94e273c5d7b76c7b62878633 SHA512 5feca35ca9a9a21ff77558b3dd46d29a0e451e789ce696554eebfa2e9fcbde56d61d72954c6262276762c25702dc1e697467ca47b996c664cc3b8bce004229c3
 MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2
diff --git a/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch
new file mode 100644
index 000000000000..1600af599b28
--- /dev/null
+++ b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch
@@ -0,0 +1,39 @@
+diff -ru a/configure.in b/configure.in
+--- a/configure.in	2016-11-16 02:29:53.000000000 +0200
++++ b/configure.in	2020-11-21 06:07:06.778092416 +0200
+@@ -152,9 +152,9 @@
+ 	CFLAGS="$save_CFLAGS"
+ 	LDFLAGS="$LDFLAGS $BDB_LDFLAGS"
+ 	EXTRA_LIBS="$EXTRA_LIBS $BDB_LIBS"
+-	AC_CHECK_TYPES([u_int], , , [[#include "${srcdir}/compiler.h"]
++	AC_CHECK_TYPES([u_int,u_int32_t], , , [[#include "${srcdir}/compiler.h"]
+ 	                             [#include <sys/types.h>]
+-	                             [#include <db.h>]])
++	                             [#include <stdint.h>]])
+ fi
+ 
+ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],
+diff -ru a/tags_cache.c b/tags_cache.c
+--- a/tags_cache.c	2016-11-16 02:29:53.000000000 +0200
++++ b/tags_cache.c	2020-11-21 06:02:55.043214842 +0200
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#include <stdint.h>
+ 
+ #ifdef HAVE_DB_H
+ # ifndef HAVE_U_INT
+@@ -32,6 +33,12 @@
+ typedef unsigned int u_int;
+ typedef unsigned long int u_long;
+ # endif
++# ifndef HAVE_U_INT32_T
++typedef uint8_t u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++# endif
+ #include <db.h>
+ #endif
+ 
diff --git a/media-sound/moc/moc-2.6_alpha3-r2.ebuild b/media-sound/moc/moc-2.6_alpha3-r2.ebuild
deleted file mode 100644
index 649ff0ddc2ed..000000000000
--- a/media-sound/moc/moc-2.6_alpha3-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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? ( virtual/jack )
-	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-r3.ebuild b/media-sound/moc/moc-2.6_alpha3-r3.ebuild
index 76ce43971282..7bad54ab70ab 100644
--- a/media-sound/moc/moc-2.6_alpha3-r3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
 HOMEPAGE="https://moc.daper.net"
@@ -10,7 +12,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 sndio speex timidity tremor +unicode vorbis wavpack"
 
@@ -58,7 +60,16 @@ DEPEND="${RDEPEND}
 "
 
 S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${P}-stdint_uint_types.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
 	local myconf=(
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index 985acf62ebab..f1a6d9bf08df 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,3 +1,3 @@
 DIST mp3splt-2.6.2.tar.gz 260901 BLAKE2B 49b45f53fd1a646993aadb6c18fb0cf7530b61f3ab5ddcf7bf220a6cdbde9844dfa048f22c10c1c89ceff2a5f77744b17c70e1aae7120300c606316b0a48eb0a SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b
-EBUILD mp3splt-2.6.2.ebuild 669 BLAKE2B 9778869a1ecbf45101d6526a6c3e2098ea1226a468bcb201764a55fc362c6d48c580b94f5827317c4f42f996f1b66758f6fd2e8c8f49535f9d4063234801946d SHA512 0233436979878c9689724e98697f136ab838eea00bd498f641fa910bbd7e654cf4b053473946c9be891ae060c614c81dc785ed3952f1cfc40eb8961d1194c38c
+EBUILD mp3splt-2.6.2.ebuild 663 BLAKE2B 3b9875d82e0953276028e9db67b7511e388508fbd2dac554da004f3d01501f5632d684412c3d424855c6f435dd7cef28a1a0db84a180abb2915b3965e5d46511 SHA512 b3b080bec465fa2dda46b3e16acbef2824ce0adfcebbba461c81294e19e9b083a9f8749a2026f9189a1a7ecad824ac6e3d41ad4afbf7b8b7af3ab58033e4477c
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 70287bb74e75..dc62c47c6519 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib
-
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
+DESCRIPTION="A command line utility to split mp3 and ogg files without decoding"
 HOMEPAGE="http://mp3splt.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -15,9 +13,11 @@ KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="flac"
 
 RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_configure() {
 	econf \
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 375ffd203d56..63ced1894da8 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
-DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
 DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
 DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
-EBUILD mpg123-1.25.13.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
+DIST mpg123-1.26.5.tar.bz2 1051356 BLAKE2B c58ccb78b406bd9405c803d4d203a75ae981e3493fab84e15da49290d2d1b87912292838aa48c50cf192b8bcee4ea1bf18d89bbfc6df14452cb350356e6cbba0 SHA512 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
 EBUILD mpg123-1.26.3.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
 EBUILD mpg123-1.26.4.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
+EBUILD mpg123-1.26.5.ebuild 2771 BLAKE2B 7721bbdde0b129453bf1b378048c05bd30d1e263bf34e78b472c0108cd449a7e223e35faa21af2c8dc464b998fd6e27428ff0974928565bd7117b0c726c8bd1b SHA512 4db32918d1f4c44f8eecd88a31d137a049f10ee0445cff76c83c266964752d15e1a6880fb2cd39f8fadec8af160cda4e0a30dc2006a93fa5364c9b2d9ac1fb28
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.13.ebuild b/media-sound/mpg123/mpg123-1.26.5.ebuild
index 634c8ef13f42..0a9547accb74 100644
--- a/media-sound/mpg123/mpg123-1.25.13.ebuild
+++ b/media-sound/mpg123/mpg123-1.26.5.ebuild
@@ -11,7 +11,7 @@ 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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa 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.
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 2c2038c5ea61..0547fcd837af 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,4 +1,3 @@
-AUX fix-missing-gint.patch 629 BLAKE2B 934363d22d7f7fb4eb8f0116418a703d83c50847b249623fe313f007d58a54b99691b611b76b6fcee714d5df9e73d21d25ea4914bd66096cf12e645f28fe703c SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9
 DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
 EBUILD pasystray-0.7.1.ebuild 999 BLAKE2B 311f499a2c1eb72326a348893098836166330425c323a9cd6ed117f0619eb7a8179d1c883344143d0d858f7037193451c5b3c0486f47dec52bb192aad557e5c0 SHA512 74b5e0e8fc57f0bcc6c6285dffb7c60a1a9cb32f9d96d05b64a429a6f79bf0c638434529cf36323387fff1338cc5f6bbffe3362efe1d6a0179f4e093d7bc635f
 MISC metadata.xml 665 BLAKE2B 56e3f4e8d410103f68151907eb18480ef65852005c2aab9114c8ed90d834d728104bdbe54e578603fefa6f0fe312256eee6c9b1bc4a0cc8f3df3b4c552f8e60b SHA512 7558ba66153d9ae2ab0c41eadd5cd297c7d93484155e4d587c636453b9537efd7d9a3a6366e6f26c17c2f565bf60ed10e00da7b83c1f3d6824b4db306f7f2d98
diff --git a/media-sound/pasystray/files/fix-missing-gint.patch b/media-sound/pasystray/files/fix-missing-gint.patch
deleted file mode 100644
index 7eeded9284f1..000000000000
--- a/media-sound/pasystray/files/fix-missing-gint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/notify.c b/src/notify.c
-index adec0ca..8b54808 100644
---- a/src/notify.c
-+++ b/src/notify.c
-@@ -23,11 +23,13 @@
- 
- #ifndef HAVE_NOTIFY
- 
-+#include <glib.h>
-+
- #include "notify.h"
- 
- void notify_initialize(){}
--notify_handle_t notify(const char* msg, const char* body, const char* icon){ return 0; }
--void notify_update(notify_handle_t h, const char* msg, const char* body, const char* icon){}
-+notify_handle_t notify(const char* msg, const char* body, const char* icon, gint value){ return 0; }
-+void notify_update(notify_handle_t h, const char* msg, const char* body, const char* icon, gint value){}
- 
- #else
- 
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index 59b2ce26e7cb..2debe3c1195f 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pavucontrol-qt-0.15.0.tar.xz 97480 BLAKE2B 183c3cbbe87b6867bb116041d41dd29f5ba72156e9078a4f09e5ffcbd3e123f6511cb06c99ce3cc8ce243a0551b132438bad7b14ae759cc775974c2ad3388bf3 SHA512 c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600
 DIST pavucontrol-qt-0.16.0.tar.xz 99952 BLAKE2B 926e248f61b1652af04f772c09bc000d0f368ba6449cade308275473e970068a58ca25cccea5e4bea289424b507e3d24f30d54d76c13096e0e8047c5ea996950 SHA512 781122b57321cf1e3eff2210e7cb949c819d0148050897d3a9673e846c28fae7a926b4d840c603dac9dace8126bfc49179a737101f4d5b6ad4fe5946d82bd0d5
-EBUILD pavucontrol-qt-0.15.0.ebuild 704 BLAKE2B b2a1d666b2849b8f11e52d605e29b002e96e52ddaeb91819ad95350df2b9fe87cad729adfcb600c4008b7b378cf433a5a4dbe042309c13dabdd906b7c5769928 SHA512 b0351da1c8083bcc130c4ff560185a4dae136eb5a45071de6bb8a07703fa1de9a390f7a28d1acc00ba235a800bd612bcc2a23fe7659adc3412c3c2c4eea058d3
 EBUILD pavucontrol-qt-0.16.0.ebuild 704 BLAKE2B 75fa0c724518984b4cc80a3f8caacfcd4eb134a45accd83ac1e1b4e4f1829af9937667c358361a58882d2d8731accf530f492142bf337ee14c5896fd8964d6f4 SHA512 1e563090713059c44963b63e05293d836f363e931185c1b32b8863ec09c04129f666b1df3f810d3a974de43d3e61535c9ebcceea7fa2624ba2729e4ae05679e9
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
deleted file mode 100644
index 70f14e9e590c..000000000000
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt GUI Pulseaudio Mixer"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	media-sound/pulseaudio[glib]
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 3ecc07df1911..eaba85fd4207 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,8 @@
-DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
 DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8
 DIST strawberry-0.9.1.tar.xz 9937164 BLAKE2B 64d988f3d5030a3145bc8310b4c44c12d075c584fbc4705af833953fe9dfe29ac2fe9a374ffd8a0494b58d3379e89cf8a9abf3a35de315b0dcce732c96071508 SHA512 6b8ef30e9e1d2349c02f254e775de4f0eed0f365c315e9471c7274e74ddb4e29b92e3da2a04d40df57450971f5656430ef94339cf246d0c1ed336963a9f9afe3
-EBUILD strawberry-0.8.3.ebuild 2879 BLAKE2B 2aafb75ee7415b165024983c825759f0355c2c0b86e0d3a8e308633ada9a9b9eae2209bb9bb0c554ea6e7469cc5b84d7c48012354b5c72bc13cac3c64f433267 SHA512 36fc1bf4ee4a8aa2d221cb7f402bf1fe4277544d792980d85489b5242540d48f843d10af0eb66b2acf61d3c6ebff43b3a5cbc4444ba05ea40e9d49a573e6994a
-EBUILD strawberry-0.8.5.ebuild 3045 BLAKE2B 0414e05ead58a2a571e074c79bf118d5377d205aa2eda08fe472360a51d4b61f601429a66891e4cfb24d069ca0a3ef8f6addaa836fada2de364881d7cb99d025 SHA512 07f79ac5c27140b1aa7c533d8d2ccebee62cb716dd77d9669dcc77afff718eb5d6ff84624de86e9ac12f4693a1e1621c0eab60ce056ed3d3d6f2074c9853d57c
-EBUILD strawberry-0.9.1.ebuild 2990 BLAKE2B 908b9e0bd8bff064c66f05d1c0d86f6102f5b01b183e4af1f572f320bd0bee4ed098edffab1ad9e113ca0f47364c02bbfdb0256128558f9ad8eb08db5b39d44e SHA512 7faf0fdabd819a94971406203f42968874021adeab094a9d58eb9e6a8b53474d53fd58caec47c5aec43045b9495634643719c7a1ba4b1e027bf0846e8048e88d
-EBUILD strawberry-9999.ebuild 2990 BLAKE2B 908b9e0bd8bff064c66f05d1c0d86f6102f5b01b183e4af1f572f320bd0bee4ed098edffab1ad9e113ca0f47364c02bbfdb0256128558f9ad8eb08db5b39d44e SHA512 7faf0fdabd819a94971406203f42968874021adeab094a9d58eb9e6a8b53474d53fd58caec47c5aec43045b9495634643719c7a1ba4b1e027bf0846e8048e88d
+DIST strawberry-0.9.2.tar.xz 9956324 BLAKE2B 0b5ccfa76aa98c0d7cf5ca0f79465948c34d6c7e7f51264b1fb8623099a4de2d0548464f51d813a4b75b8e524c653a32e8682410741a3c3fbc604ccaa4816204 SHA512 2ce22e7bed5832dc33191f5ff6f0f656861f4e574ad5ae2d2987a0c75274490dad2723579fcc5766f398654600a0819c5d0fa956dce12a54d5aab505a2f1ea30
+EBUILD strawberry-0.8.5.ebuild 3043 BLAKE2B 8989c13d89c0513cf77ea672b3aa3a7fa9677946722bdb27d1d967106a53001a3cf45dcfedab0c9a76dcf2d2d6f75ddb111479ec884177b4edb3df289fc1cbbb SHA512 c14726be6bc9e0ed00fe1652a5ea4d9621d26abebe18ff83e76abeb0225acd2e3b6dd32a7419883c4558d60d85a4b228108346d8986b70ff8f5ac0e2516849b0
+EBUILD strawberry-0.9.1.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
+EBUILD strawberry-0.9.2.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
+EBUILD strawberry-9999.ebuild 3007 BLAKE2B 1b32707a4270c44dc61e21c6faa6906b87317e68fc46dc3311f8159467a9c299efafe64643920afff04ab42f288918ba8b3632f8447f7eb3a99ef313f82376d6 SHA512 cf8def2118dd90e1c0a4e01092a041f814c405cfd408df762980c017192d781b8761183085e296a17e8e1721a8b14a33eb6cd6ab0e30c271f72d5a05234fc1e5
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
index 27a5e697eee1..103a1e6068f2 100644
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/strawberry/strawberry-0.9.1.ebuild b/media-sound/strawberry/strawberry-0.9.1.ebuild
index 3f39eabea722..be8135080fd1 100644
--- a/media-sound/strawberry/strawberry-0.9.1.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.1.ebuild
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/qtopengl:5
+	dev-qt/qttest:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 "
diff --git a/media-sound/strawberry/strawberry-0.8.3.ebuild b/media-sound/strawberry/strawberry-0.9.2.ebuild
index caca9c641006..be8135080fd1 100644
--- a/media-sound/strawberry/strawberry-0.8.3.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake flag-o-matic l10n virtualx xdg
 
-PLOCALES="cs de es fr hu id it ko nb pl ru"
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawbs.org/"
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -44,26 +44,29 @@ COMMON_DEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
-	media-video/vlc
 	sys-libs/zlib
 	virtual/glu
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
 RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
 	mtp? ( gnome-base/gvfs[mtp] )
 	udisks? ( sys-fs/udisks:2 )
 "
@@ -71,17 +74,21 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/qtopengl:5
+	dev-qt/qttest:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 "
 
 DOCS=( Changelog README.md )
 
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
 	cmake_src_prepare
-	rm -r 3rdparty/taglib || die
 }
 
 src_configure() {
@@ -94,11 +101,12 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_SYSTEM_TAGLIB=ON
+		-DENABLE_VLC="$(usex vlc)"
 		-DWITH_QT6=OFF
 	)
 
@@ -110,7 +118,9 @@ src_configure() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
 }
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 3f39eabea722..be8135080fd1 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/qtopengl:5
+	dev-qt/qttest:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 "
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index e01327f00fe6..e8e72cb9e170 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -3,10 +3,10 @@ AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc450752837
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2 SHA512 bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
 DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb SHA512 4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
+DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4
 EBUILD umurmur-0.2.17-r4.ebuild 2631 BLAKE2B d5ee8f085fcdc6721821fd8cdcc09170d4643779543e3b19645fe0b350ee351a2890bfc15e95518442d600ccf4c8426d5daa841ce55cf95993cab6f8d59759c7 SHA512 a4fd25d49c4d53d58d9ef17db266d428648d9cd77f9c5aeca1f4c857f90c5c975895401bf0b77eb6addc18cdb1073f994bce4ee816b5b2646c9279580d22c123
-EBUILD umurmur-0.2.18.ebuild 2634 BLAKE2B 439488afcd30893130a98e21e63ce862ce8c620cc284056fcbc8475657b4a104b6a3658d82b1f085557e568a3e40269779ff827905bcc866ca38b94245c45e18 SHA512 437aa84ae793e82073cb038a206ea19eaaef3749b8c4bf9c78b3db7bee8f9b55329224263f5456cf65c451c69bc23a69fb3cbf94c977f0587651f5350a5b7b27
 EBUILD umurmur-0.2.19.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
-EBUILD umurmur-9999.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
+EBUILD umurmur-0.2.20.ebuild 2469 BLAKE2B dc72a7c10f35247247dcf0266ccd879283a82ee0f0027e5ba36ff6eb0d8e04f77cbbb1e6be3a1c50f69b2b7905856eccfbdb63e028385a3d6a692c0ed1dbdc09 SHA512 7d25262e17974df36e6c9de02eabfefc3b722013ef2c6d5a1f38e8169267bde6c183ac98824143e7ea91b4bb2dcf85d946443dc2dc0212a057416c6d8c40a2b3
+EBUILD umurmur-9999.ebuild 2469 BLAKE2B dc72a7c10f35247247dcf0266ccd879283a82ee0f0027e5ba36ff6eb0d8e04f77cbbb1e6be3a1c50f69b2b7905856eccfbdb63e028385a3d6a692c0ed1dbdc09 SHA512 7d25262e17974df36e6c9de02eabfefc3b722013ef2c6d5a1f38e8169267bde6c183ac98824143e7ea91b4bb2dcf85d946443dc2dc0212a057416c6d8c40a2b3
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.18.ebuild b/media-sound/umurmur/umurmur-0.2.20.ebuild
index 2eaae13bc97a..7b9bed7d2694 100644
--- a/media-sound/umurmur/umurmur-0.2.18.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -18,8 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="gnutls libressl mbedtls shm"
 
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
+# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	dev-libs/libconfig:=
 	gnutls? (
@@ -28,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	)
 	!gnutls? (
 		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
+		!mbedtls? ( dev-libs/openssl:0= )
 	)
 "
 
@@ -52,9 +48,8 @@ get_ssl_impl() {
 
 	use gnutls && ssl_provider+=( gnutls )
 	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
 
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+	if ! use gnutls && ! use mbedtls ; then
 		ssl_provider+=( openssl )
 	fi
 	echo ${ssl_provider[@]}
@@ -75,10 +70,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+	local ssl_provider=( $(get_ssl_impl) )
 
 	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
+		--with-ssl="${ssl_provider[0]}"
 		$(use_enable shm shmapi)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 5bc252e176bb..7b9bed7d2694 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -27,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	)
 	!gnutls? (
 		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
+		!mbedtls? ( dev-libs/openssl:0= )
 	)
 "