13 files changed, 216 insertions, 106 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index af45ae274c8b..9dc2a052aef9 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0fcc457ba91b..b2ed075b3b97 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -6,8 +6,6 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd3ccd02555c39cc1714c52bbd1e4bc8b68ec7bf5d219a704533e4a61587c3528504ef9cd7c652924d74daafa90f74e42a SHA512 bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf
-DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
 EBUILD alsa-utils-1.2.4.ebuild 2347 BLAKE2B e88315e90b294ccdb23be786b62441b4dc8a962512253a585b52eb20c0198e6c5b19105f2f379829002afa5f04c1ffd6a4646a4c413585bf07eccb7bc7b13343 SHA512 aa4a8d1783e8ccc6ac18a1143fcb8200a24132cbe12d547ff22c77634fd05b212dfec2aeb6d72bf8f2a2526707e7898d9daba01f5673245b3d6bae59b733a19c
-EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
 EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
 MISC metadata.xml 480 BLAKE2B 1017b3f508632b0a56786a3b1e46304e4f4cbfd78335f07894ea0d4200e743a22ff0f4803f38314d0fc10dab6d35c40dd1af69e1d5aad3d36034a1cd504c4862 SHA512 c8440f0dc84c3e0d5459c07b975fc723ab346c5b817aaa1ae113964af9678d89d00692fb58494a1c88324a5cfbc9d2bede644362b34e97405c6add51730e943e
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
deleted file mode 100644
index 2c95a68cb144..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5-fix-the-nested-iteration.patch # bug #793410
-	"${FILESDIR}"/${PN}-1.2.5-fix-potential-null-pointer-from-strchr.patch # bug #793410
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 0f874cfaf3f5..e8f60335ef2c 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -2,7 +2,10 @@ AUX 1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch 2123 B
 AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4c3146b0e6fe343d4a437dfdb13aa60e0bbbf59f2959fee39f4d5bdb620fe57670e01a0963ad9eea3cf0309b3ea516e0931e9383c19 SHA512 2f6b5636ad3a16e70438fd2c1b62952416225dcc9acca686b1dc19ba4c2c5dbed4807f3f597e212d23ddf12de0fb0f315729da9ca86fbbc6766f4840dc83a524
 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
 AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd
+AUX 1.5.0-0001-Remove-test_completion.patch 2878 BLAKE2B 1a8bedd5efd9ae823f632124b4f2a273f2ed1576003ca69f689cc4e995724d691fba2018d6f3fe1fc71b0d2c5ca6b3b21380f655f0b997107abda218d34c45f7 SHA512 9b3c8f352493dd72f9206824722c2900c6877223c14726346392a4f2f861b4b3d0499f8539ea6be2d3564a8cb4218cc560d3ce4e47bcf5b1854310a1bd30337d
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
+DIST beets-1.5.0.tar.gz 1694845 BLAKE2B e4a4ad880edcc396170bca9e7d04548f22a55eac22481d2babca0d2ca71237ed0509bf9be9af12343b0d1b555e9726446e5d61e637312a4808eece5ce0302f33 SHA512 447b01dc750a69d0a33d271774f3bd3b997a203d80c220c1a961f9a8e30420d263b1e2a4682d25ff7b02e1e85155f42186cb0d3bf27ebc8c2777f68e197d4018
 EBUILD beets-1.4.9-r6.ebuild 4394 BLAKE2B 875d18123f6494160f550ee63a5deeaea8166afd891de2265d2e6236144676a8c11e273206fd8cec3cd1a21c4efdc7a3488cbcb5c2451c5187807cea0cb5910c SHA512 b722b45ead4f00788d5b2fbae80af7f46dbdf6a94fb7f55424cdb7252bc04ab85aac99238055f30c74adbb5c9c0e40b2057ea90b10293e379bdede302cb8b29a
-EBUILD beets-9999.ebuild 4309 BLAKE2B 3c00103165f4637bc442c2967edbc6d2ba3883af5bfffa1b868f8194c54b0bc77e6e6a8be4f0cb40492abd7604d0a729f53ff001f4b3b6208a2cdddb53c5bd14 SHA512 e512550a1970939c688c5fa603ee450b1fde719efa027a4e45e07a9b7afc0bfcab8aabff56d126371b82753d73122bdbc58acea7550fe7241cfef93646155ca8
+EBUILD beets-1.5.0-r2.ebuild 3792 BLAKE2B 1d710f86dd553e1ce40156604b0cb704a60e8279af09d0e54d2e56c6ded3a43e8cb68e234b6a71853c4d4e60c7d42c142cdfe4ed84c89270c73697311cea8865 SHA512 467079e422111da50a1a9435d43ccb4d4163905437ca2ecc170420c511fa92eed109791a82e9c5efb4298b66e929b1467677ccee0e15d714ed7f3b43ebf803f9
+EBUILD beets-9999.ebuild 3724 BLAKE2B 712cfa973f438b1fe1f2600886d3ab0ad5237eb85df8b8b3cfee77f290327b93dee15f2d6e68013143fde3828f1b4418cc4ae928ee2a08f8841f01f32a85d84c SHA512 e63c0218deb1fee665161dae656978fb21aa3d2abd9ebee0bcb8dff436049faf56a222d8f94bc9625c3023e5a948981c1a3bf54a149aec7cb0f7080ebe9c85a4
 MISC metadata.xml 1782 BLAKE2B d06aa5a90768970a9327f134c1314896d888d4c4e78eca01665809a650af67890753698efcc18fc3f57e128a9443f283b4b11b613f0c04be1772e218d789f1d4 SHA512 7d8dc8ca0c7ed4bd8438736ac7f2bc003b07c1c2899e7e0b3d97e89113ff565049cded486c14be9b2026d7446318cfdc0cf4f9a61731c66e61ab7b6c0f9c5dca
diff --git a/media-sound/beets/beets-1.5.0-r2.ebuild b/media-sound/beets/beets-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..f6df11983c6a
--- /dev/null
+++ b/media-sound/beets/beets-1.5.0-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
+	')"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+	)
+	$(python_gen_cond_dep '
+		test? (
+			dev-db/sqlite[icu]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_USEDEP}]
+				media-gfx/imagemagick
+			)
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
+		)
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
+}
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index e6e0f8dd5eb2..d7df175f13f4 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -6,7 +6,6 @@ EAPI=7
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 bash-completion-r1 optfeature
 
@@ -17,7 +16,7 @@ else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -40,6 +39,9 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -76,30 +78,16 @@ BDEPEND="
 			media-sound/mp3gain
 			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
 		)
 	')"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
-	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
-	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
-)
-
 DOCS=( README.rst docs/changelog.rst )
 
 distutils_enable_tests pytest
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
-
-	# Tests that need network
-	rm test/test_art.py || die "Failed to remove test_art.py"
-	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
-	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
-	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
-	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
-	# Not working and dropped in master
-	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
 }
 
 python_compile_all() {
diff --git a/media-sound/beets/files/1.5.0-0001-Remove-test_completion.patch b/media-sound/beets/files/1.5.0-0001-Remove-test_completion.patch
new file mode 100644
index 000000000000..16c1a6fe5fa1
--- /dev/null
+++ b/media-sound/beets/files/1.5.0-0001-Remove-test_completion.patch
@@ -0,0 +1,74 @@
+From a992bf194803d3598a8edc054a767858b0355a78 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 21 Oct 2021 23:16:45 +0200
+Subject: [PATCH] Remove test_completion
+
+Known issue: https://github.com/beetbox/beets/issues/1876
+---
+ test/test_ui.py | 50 -------------------------------------------------
+ 1 file changed, 50 deletions(-)
+
+diff --git a/test/test_ui.py b/test/test_ui.py
+index 5cfed1fd..48e7cc85 100644
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -1209,56 +1209,6 @@ class PluginTest(_common.TestCase, TestHelper):
+         self.run_command('test', lib=None)
+ 
+ 
+-@_common.slow_test()
+-class CompletionTest(_common.TestCase, TestHelper):
+-    def test_completion(self):
+-        # Load plugin commands
+-        config['pluginpath'] = [_common.PLUGINPATH]
+-        config['plugins'] = ['test']
+-
+-        # Do not load any other bash completion scripts on the system.
+-        env = dict(os.environ)
+-        env['BASH_COMPLETION_DIR'] = os.devnull
+-        env['BASH_COMPLETION_COMPAT_DIR'] = os.devnull
+-
+-        # Open a `bash` process to run the tests in. We'll pipe in bash
+-        # commands via stdin.
+-        cmd = os.environ.get('BEETS_TEST_SHELL', '/bin/bash --norc').split()
+-        if not has_program(cmd[0]):
+-            self.skipTest(u'bash not available')
+-        tester = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+-                                  stdout=subprocess.PIPE, env=env)
+-
+-        # Load bash_completion library.
+-        for path in commands.BASH_COMPLETION_PATHS:
+-            if os.path.exists(util.syspath(path)):
+-                bash_completion = path
+-                break
+-        else:
+-            self.skipTest(u'bash-completion script not found')
+-        try:
+-            with open(util.syspath(bash_completion), 'rb') as f:
+-                tester.stdin.writelines(f)
+-        except IOError:
+-            self.skipTest(u'could not read bash-completion script')
+-
+-        # Load completion script.
+-        self.io.install()
+-        self.run_command('completion', lib=None)
+-        completion_script = self.io.getoutput().encode('utf-8')
+-        self.io.restore()
+-        tester.stdin.writelines(completion_script.splitlines(True))
+-
+-        # Load test suite.
+-        test_script_name = os.path.join(_common.RSRC, b'test_completion.sh')
+-        with open(test_script_name, 'rb') as test_script_file:
+-            tester.stdin.writelines(test_script_file)
+-        out, err = tester.communicate()
+-        if tester.returncode != 0 or out != b'completion tests passed\n':
+-            print(out.decode('utf-8'))
+-            self.fail(u'test/test_completion.sh did not execute properly')
+-
+-
+ class CommonOptionsParserCliTest(unittest.TestCase, TestHelper):
+     """Test CommonOptionsParser and formatting LibModel formatting on 'list'
+     command.
+-- 
+2.32.0
+
diff --git a/media-sound/fluid-soundfont/Manifest b/media-sound/fluid-soundfont/Manifest
index b3289bc47a6f..6e54669b3cbd 100644
--- a/media-sound/fluid-soundfont/Manifest
+++ b/media-sound/fluid-soundfont/Manifest
@@ -1,4 +1,4 @@
 DIST fluid-soundfont_3.1.tar.gz 134835922 BLAKE2B e280d64e977b290e7b6512b6781631c7e3dd08aa37a8c934243b4569b3b59810640153b03405d5845c76b7c4701ffe9d528a81d8101d9668af0c95df8c0a180e SHA512 014394752ac50d3162c87903d9dd6b38d199ddfab10e2dea3b2a96d02ddcb876a792cc20bc0e83be5ac15eb0c7e261612eedcd792a3f0ff85a7d032a7dd24f29
 DIST timidity.cfg.bz2 10667 BLAKE2B cdcbf9eed076c6ed210f90f7c592a830e53c6d253eb2b13c3aba00b6040aed946af59981707e3e55a0757fb76b30b5ba0676b9cffdc433c58975b38702cd98b2 SHA512 def3ba456c040a010e7e5d22eed1e1674f8b50853c5771085a16eced47e9a8e429b34564218df6a4a16f697eda69365afe51a0d158b0672a66fdf1b0284c50f5
-EBUILD fluid-soundfont-3.1.ebuild 675 BLAKE2B 604bb758f90e5fa82ce0979c840a14100c8abf1fc4bb1bfa890bbe8b7b1a741f1bd684981fc19037e65eb2c4bcd4a7a6940c9247836613c8b8792826b5a13578 SHA512 28fe61370ebdd0ad29d5773e61657a610d700290977705f0e41242736c9d33d793de56d8137514d163b22e8cb5323d1fa00c8b1a85caeedd4d0fd4c2387c1c08
+EBUILD fluid-soundfont-3.1.ebuild 680 BLAKE2B 655f20fa8a5467b46457b2d93726444d41e849a6526a96add622cc85a385090d0bf74abdb3e391736661fddecc4fb23edbe0b4b9d0799dbbfc77507734c66607 SHA512 dfa94936e0f37d84b587366d6a59db06e1a07995db2d1e3373bf6cd96dc444ce08353e8532cd5a7facc1c45bd01d2b134cb95684934214be7d20eadc781a1b66
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
index a26b6e9316c2..8b31150538ea 100644
--- a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
+++ b/media-sound/fluid-soundfont/fluid-soundfont-3.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
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="timidity"
 
 RDEPEND="timidity? ( app-eselect/eselect-timidity )"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index c222017937f0..88ddd574f509 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
-EBUILD pavucontrol-5.0-r1.ebuild 834 BLAKE2B 8d4d834c90a5705525ac51501dc792ac66bd6ecd7bc5fb7292b767915a1b340fbd6db3cb032dfc4b924dfae300296de8b79231b00623858e467bae4398a35804 SHA512 34cafe43d0dd5c813635b96f203f37be9d46982366e0e5d5131bc7c68dfdd22d5af8295425f27924b8c442e1ffa3eebb5f492d550b837eb69a18ce483dad2699
+EBUILD pavucontrol-5.0-r1.ebuild 833 BLAKE2B f90664f078155feede1197fc5b096eb61dc23af0b34795875e5a621787cacc21feda80e328008750f70205c263c5eeed49acadf658ed6a39d48d08bbb3622b74 SHA512 aa80a32798079aa0fc77fb9e0959465967e287503d287df270abe264d36da6d1d079eedd6a270c41b314f709843691c414de906140db62540c08093ae689ecec
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
index ad306056748c..6274d4258cf8 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index f373b5acdcbb..b1c7244d1f7b 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
-EBUILD sound-juicer-3.38.0.ebuild 1256 BLAKE2B c45e8779f2ce3edf34d6627344afc96f7664ccdf8dc44628d09f46c8cc386ff4f949b882d5c8f86f02802c440d5608c73c818a272384b2d8741c837fb566ec84 SHA512 294cd9c42b92348ee15c332af4f5196e4d83b4292d5e6cc9e4f7f1cc6b964cd869286d669c1cf6f22786ddfef8fc6983a0b17694b3ab40f1c2bca3a16fb39540
+EBUILD sound-juicer-3.38.0.ebuild 1255 BLAKE2B 5ff9754b15e7c07adc065505583936ebc0d6301bfcf359a1e51a308f9b75cdd86c17a473c50a32e973170d7f39c302784042b1b62b243eefd49b53ff5fe3f50c SHA512 cdaa222520fa7aa201a15c91d243974ac6d79db076e01dc8155b1da3e42cce5c9c0d182ebc9cdd80900f5c1c187a7df1b7bdab945d8021608edf4031d5ae761b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
index ead4e36ce1ee..8109b508d30d 100644
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="flac test vorbis"
 RESTRICT="!test? ( test )"