gentoo resync : 17.06.2021

12 files changed, 162 insertions, 245 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f86b64e61795..175dc8c91952 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index a3010554deda..cc35e53fc9b4 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,4 +1,6 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
+DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
 EBUILD alsa-tools-1.2.2-r1.ebuild 3427 BLAKE2B d82cac5f95da90ab930cbf1ba96ba3bc3c00f5453cb80dd1672210628fdbcf0a3a1f14b578e56ab89a058edf0e33305ccceec21d3163b4ef628355f0adc34dec SHA512 c77460f347017900b62532b4a65bae9c5a858a7ebe9c329dd6c75333dd1d1f66455d6401c2f558df8cd4d8e9e90b3b06ec4e7645657810b4bda8b15f85428b7f
+EBUILD alsa-tools-1.2.5.ebuild 3432 BLAKE2B b8078de68ecc0be971c345d0d2e7174faab09b5d21402dbe213f8d66b9fbe7f948acb9fd50180b902ea8ed66668ae3167a9138eef69b69ee479e70fd1a795525 SHA512 dbd8920266ff67a38b04a63af82af393a984a9d0cc56acceaff5bbcb59d9c77eb3b434750758c8a613ed06ca8406c985eeaa8be6666ffeb2f3c96fb8d91b637b
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.5.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
new file mode 100644
index 000000000000..d5f96bd0e131
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic xdg
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+DEPEND=">=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		dev-libs/gobject-introspection
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+	)" #468294
+RDEPEND="${DEPEND}
+	gtk? ( media-fonts/font-misc-misc )" #456114
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/envy24control-config-dir.patch
+)
+
+pkg_setup() {
+	ALSA_TOOLS=(
+		seq/sbiload
+		us428control
+		hwmixvolume
+		hda-verb
+		$(usex alsa_cards_mixart mixartloader '')
+		$(usex alsa_cards_vx222 vxloader '')
+		$(usex alsa_cards_usb-usx2y usx2yloader '')
+		$(usex alsa_cards_pcxhr pcxhrloader '')
+		$(usex alsa_cards_sscape sscape_ctl '')
+	)
+
+	if use gtk; then
+		ALSA_TOOLS+=(
+			echomixer
+			hdajackretask
+			$(usex alsa_cards_ice1712 envy24control '')
+		)
+		# Perhaps a typo the following && logic?
+		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
+			ALSA_TOOLS+=( rmedigicontrol )
+		fi
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
+		ALSA_TOOLS+=(
+			hdsploader
+			$(usex fltk 'hdspconf hdspmixer' '')
+		)
+	fi
+
+	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
+		ALSA_TOOLS+=( sb16_csp )
+	fi
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS+=( as10k1 ld10k1 )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+			;;
+			* )
+				econf
+			;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS[@]} ; do
+		# Install the main stuff
+		cd "${S}/${f}" || die
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 9fe73fb22571..dcb4a17e28bf 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,12 +4,10 @@ AUX alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch 1663 BLAKE2B 1
 AUX alsa-utils-1.2.5-fix-the-nested-iteration.patch 989 BLAKE2B 5f5956c72a0e9605011b953f98ae29803f50e0c427c794331d1b99e7c1a4dc81379a074a1403ba71737cf8de03c0d749e4544a22a8e2f39984ed9dd6482b40dd SHA512 0cdc8c41b70be714515f355a630fc28b68b95cb7b5a5cbb58c1b288ee0edf3128eb8f80bb874844cf11268c89bb04e82f1fe8c4c1ebb7cd7334d28f2896d5a85
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
-DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
 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.2.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
-EBUILD alsa-utils-1.2.3.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
 EBUILD alsa-utils-1.2.4.ebuild 2348 BLAKE2B 0b51fb69c74f99f97c623fd16bed5cbe310aa16a3e1801206b2fb4ee1b66aaa67e9cfa5fd23457b700adc2eb7d337f429007ab9166db0a63f39a8916baf99d37 SHA512 ab75b6e5a55e3488bc436d293354edbd6f135047be7871123ab408f0fabdbd46bb0e0c60594e55bec69b914bb26d1805a7174e1891c530dc63a7a8f04a4eb0d8
 EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
+EBUILD alsa-utils-1.2.5.1.ebuild 2355 BLAKE2B 8b47f02095f958701942e6f628da8fe13b2a4f84c47fa05ea4238a387320e67eaa805eb30ad2ccac4e0fbc1c656251a0a3a09cba8a70db7b06e1c633b9793d43 SHA512 0905aca80c695c563c0154616afb6a02e7af46e433d4fbbddcf79ba1172798416633f7395c97fa011cef56d33ddad1b69c7eee28c88ad90e62400ba488e393a6
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
deleted file mode 100644
index 05318d998ea3..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 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.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/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
index 05318d998ea3..ecab802cde40 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.5.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 3647931b739a..f144e70c7271 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,3 @@
-DIST qtractor-0.9.21.tar.gz 1945423 BLAKE2B 8c76966695e6054cd0d3743313f50de1bf4f741dfaad0d60f41ae87bd531ce394d11c7fc719c75ee159bf0bf7dd3037679cb93d7d4295132a7dc2fa6d89a786e SHA512 12d823c4efd557709d83e0e5ace6cb84ac066a0eddbfdbac0dbaf6b75e6bbe37c0e3548270e80fb89f318c58db4b0ebad95daac989eb7d6b8f82b8cc7ccc3a3c
 DIST qtractor-0.9.22.tar.gz 1946367 BLAKE2B 7d53d9a31f6d9df6bdeb19d4d5687ec3037842ecfcd4e1ae167a541ade301c4cee1f1bda68c9186ec8d5f0e879c80f636536b5acd51137f4be783f5892d377be SHA512 80e5dae7c38b95719ca16997022529dfbd5c51af209b54f819098299d2798677b6238dc9eaaf664cdf2437facda3757e39472ca74636eeddbb5e1f0f28a78b2c
-EBUILD qtractor-0.9.21.ebuild 2456 BLAKE2B 36c9e63143b085897618b492a94a7539281959d12ae8618192e915dbd28c368409fb6f5460b5856404b25505080b72b10d6b6fc0747a3e0bfb60003d81fa3d27 SHA512 c34b4164cb5a367caf9fd2e7e5ab7743b11b4e5c517ab30b0b4844c39bbd1212e8a09394b8984c09bab05de31405f6f871a5f32c2cc183746e26f497e4d0b879
-EBUILD qtractor-0.9.22.ebuild 2458 BLAKE2B 5636da8bb06ebdbb61bbf36fef5874196fa98acbad31fe83fee09a139726a1ea2a426f5a2bb9b7771845b3a7e6b180cf0f9534773e7f4d44221321dd3612f423 SHA512 e28098e49f0a53fe5e779b65e604f7b40489060a5a4186669d7543e0b89e07fd6976599a8d87bb791a2fe98f3676ed76ecede7d0d7317c52281f874753917614
+EBUILD qtractor-0.9.22.ebuild 2456 BLAKE2B 36c9e63143b085897618b492a94a7539281959d12ae8618192e915dbd28c368409fb6f5460b5856404b25505080b72b10d6b6fc0747a3e0bfb60003d81fa3d27 SHA512 c34b4164cb5a367caf9fd2e7e5ab7743b11b4e5c517ab30b0b4844c39bbd1212e8a09394b8984c09bab05de31405f6f871a5f32c2cc183746e26f497e4d0b879
 MISC metadata.xml 890 BLAKE2B 449553d45029499af8d185e9e524674f035841e5e36fc7acb8781c82b4cd8f804c87075dae592481294835cddef2a40dbbbd7f9ca7e507e6191680b25d19eef9 SHA512 bf1fc12e5da4b1106ee3a84d510c255fc9b4ab9f1a59c1827b1f81df3ede0cbd0916f5cb95d04872b7771ddc03058ea6d7a16c826e4bb5afe42438f0347b8486
diff --git a/media-sound/qtractor/qtractor-0.9.21.ebuild b/media-sound/qtractor/qtractor-0.9.21.ebuild
deleted file mode 100644
index 77a9466a3449..000000000000
--- a/media-sound/qtractor/qtractor-0.9.21.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic cmake xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	aubio? ( media-libs/aubio )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=0
-		-DCONFIG_VST=0
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/qtractor-0.9.22.ebuild b/media-sound/qtractor/qtractor-0.9.22.ebuild
index 56455102cfda..77a9466a3449 100644
--- a/media-sound/qtractor/qtractor-0.9.22.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 6eaf161e118c..1ed422cc4dc3 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.0.tar.bz2 466517 BLAKE2B 9fee766b71ad7f9cd96f9dfd859dc31434f14c913c75f5a8e76c66150522dbf04c6e28582269d1603c6d53d6db436e9e7f73cab1172c0d6b004cc71edccb21c8 SHA512 b3e1e40792661c1e4ce3a5274513b4b75742ca861a6233c2653d6df90b7a89e086d15a4196d59c7021c48e9e2aae83116ba29c3395960179d602f0cb06c1f608
 DIST vmpk-0.8.3.tar.bz2 481537 BLAKE2B 985609c3a9ac69b29ac40dd6a71132d0f429d7961d306caf1f77e9e5b510e8b5af8f996febf87df8dfde02ee486cecbb1ef412dd3ba718dc3f793771230e5988 SHA512 829121a9f7bbbe73a9882c9f569204e4096c57c1c7dc7ba22949a35d3fe104028ba7e259fc2163d2711f31f8adfd52c4ec95bfc78ae9b35574835c1b404183ca
-EBUILD vmpk-0.8.0.ebuild 908 BLAKE2B aca2539550492fbb5a379a7d3e6b9f81f241f4a17df342836d718b9df7e0ab6fd2e7d29485dd4d537a3e0b44bc69e81d65101d72583c08ff7cd6e182ccaab6db SHA512 0138b45e35d4c8ff15e6647656255b25965b56141ad46ceba6d4b72db150f8526e8d3da26be5d2226615f18412e302eae4b9ed48f7dd324f0162450ddcec21c5
-EBUILD vmpk-0.8.3.ebuild 902 BLAKE2B 096ba5ac32644adbcd1be030ad996fbc30ab412c5049ba0a6feba4862da96e1a8bd203af871c71493bf360d0b06410e20147acdb808cbc44817636f2ec34cc86 SHA512 312b15206dda76d9315492a4c9651af13b0086ea8be993d28eb3b8d5f440d3be489539136e2c2f8a2ce027fadab934ce084aed24757101ab119f65e467994682
+EBUILD vmpk-0.8.3.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.0.ebuild b/media-sound/vmpk/vmpk-0.8.0.ebuild
deleted file mode 100644
index 7d6762defdb4..000000000000
--- a/media-sound/vmpk/vmpk-0.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-2.0.0
-	x11-libs/libxcb
-	dbus? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=$(usex dbus)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
-}
diff --git a/media-sound/vmpk/vmpk-0.8.3.ebuild b/media-sound/vmpk/vmpk-0.8.3.ebuild
index 8c7430f56134..7865aa398687 100644
--- a/media-sound/vmpk/vmpk-0.8.3.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="