gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /media-sound
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
62 files changed, 810 insertions, 1029 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index df6f403c05a4..945adfeb7551 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 2dbaa119e788..cc2ffb36e1e7 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3-r1.ebuild 1840 BLAKE2B 1050a671bb6bc978e6cad570ac6b3364c673dfba63495c2d20818e169235ddfdaa3d4bf8ebc405825c2183805185d73777108fcf6092615f1faaa287d20cf30a SHA512 f87635ca4642c25c3f9f48cbf1bc4bc3f510a2e105e755c73c754bb358a911bccb75a0f10ac118728026dfec88a908dc4f2ef42ba06dca1b75adf2010ccbbdef
+EBUILD abcde-2.9.3-r2.ebuild 1846 BLAKE2B 13f0637506f6d8807718d471a98212fe85ae5aae10b0eb01abdcbe46e876ff5939624c9f6157407e4f46820a23e330b5ec514bf8e40037e89e3afb45fa281395 SHA512 8ae9e62718633a189bee5ec4be418f7bf76f8c24ca95bea0abbbb5ec50783eed0aaecaf65cc4c87cc18e7da6b0977f59e52071d26c33aab48b48e0a4a853248a
 MISC metadata.xml 687 BLAKE2B 003c2762435868462c70ea9a6d21e7c50b7db96f10cdf3ee68788d027f92e6e656046dcd070f3054888c473dc0fdc273462f36067c2ebbe48b64fe4a8cfa95cf SHA512 42995ba554653993a07ab04e6ad8f8a50ed2fcf3319869fc54b76480a61fe2c22c1186c39354f9a5920ed4b065cf8ef52fa10e67cfa258199dae6da9db3a9581
diff --git a/media-sound/abcde/abcde-2.9.3-r1.ebuild b/media-sound/abcde/abcde-2.9.3-r2.ebuild
index 2c0f83b27dd3..149dd9258360 100644
--- a/media-sound/abcde/abcde-2.9.3-r1.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r2.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
@@ -17,7 +17,7 @@ IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus re
 RDEPEND="
 	media-sound/cd-discid
 	net-misc/wget
-	virtual/eject
+	sys-apps/util-linux
 	|| (
 		dev-libs/libcdio-paranoia
 		media-sound/cdparanoia
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 345582f5455d..d2e8e6979b0e 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,6 +2,8 @@ AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554
 AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8073c4493ea41eaf833fcf2f4616a6a828afc03e116de6c1807ee2436c9f385bf39527406e93c628b07dda2c16b3f5d51a0be SHA512 33c72c178812f527b7c2ce27635368a8f6531369025d36ab4d760f8ee19391027029de0b3d8698454b5eb35a1227b5d6efc1602fc5d5b6f58967ecf89579aada
 DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
 DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
+DIST abcMIDI-2021.05.19.zip 603712 BLAKE2B e856eb8773be0525c783aeec60767f8e58a04965e55bf88eda5c9e3227b73d3532ae87580fcb9d9a5b2636c396330886b9ae2694b553b74a881634827c7deaf1 SHA512 d362b158b9ce15ad3510597c83f59acc9135d6052d9d12e4394f8e4d630d5ffd1c804c18e80110cbc7f8a174e60993189749170a414f1d24ac3c911a291af234
 EBUILD abcmidi-2020.01.22.ebuild 836 BLAKE2B 40f9d16d5c10a2897d1395ca2334e8ec58ea32a8e126ce5bf9e570c3e0fe8a5081737e3c83d71d522abaae6e7b7eaa2a3a3c875690e62e8bf88cc9351af9d4e6 SHA512 a64b2ce08d7968f332b9d617274ff0c08af97f554f375808608baa7c7687ff8a1ffcf1f4e264fa55346863aa853955e652f9243c5aca4536360bbea7068ae892
 EBUILD abcmidi-2020.06.07.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.05.19.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2021.05.19.ebuild b/media-sound/abcmidi/abcmidi-2021.05.19.ebuild
new file mode 100644
index 000000000000..10c98f2d31f4
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2021.05.19.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 7d1010652127..af24dd16e9a5 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,3 +1,7 @@
+AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198
+AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
+DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
 DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
+EBUILD amsynth-1.12.2.ebuild 1118 BLAKE2B 12cd771206dc35c034e6a3921152dd7dfc668827419d454a9ff3be9634276715e371c4221144a636aee1b442c614e47c317f57e720ceef2267eafe85ec6db2f6 SHA512 ed7c8149066a5e9530226e4fc4b6629a3dc0a396aae02e34ab8647b31a3da82b4ff467ab59daf88fad55580270aeedea2b18ecaa14ad899be8e521997a0685be
 EBUILD amsynth-1.8.0.ebuild 1040 BLAKE2B d4927d245ac316c8e82507617d5b911701dcc4e4d083c5d66083155c66d5e756df22de9d71eebbe3045cf7491034b5bf64e80f1de9d7572b1218ac0929159256 SHA512 d181aa4e5642c3f0c03cbdcbb952a7d5468d8a1006a583b6baa236394c5dd66801c6a06c8b934c62139c5b9f3b700cff331141f0776e5509311aee24cf46c91d
-MISC metadata.xml 472 BLAKE2B 0af28a6f759474d8b879c6830e03fe043c623192b36a39acc90c431f93a82eccd392bedd172414610a58f3d74fcea6d41e081dc3cb06eec32b3352be7c2d7bfc SHA512 41a2736e7376b37ab7770ded3ee6653891ab56d4c52c5c96601d2ee3b5269de1fb2fda0de464569cae005b6b08bc5813ec9a4c20bbdf9ba7cec8d5eecae190cd
+MISC metadata.xml 580 BLAKE2B 529ab272ffd8198a78102fe385ba94a10b7fb94942b4d464f920768b716ecf04affe79aba38c5566c10803738c957942e840dc9842f4ab775bee851a15c0e7d8 SHA512 6d492efb5dffee7429d85256f263c9f34ef799ec7cde5745e8246e72d9d32d6df7423a67f121a7c7870fd8672eef1261f794b52a585e23f2df4bb14d6f3d67d8
diff --git a/media-sound/amsynth/amsynth-1.12.2.ebuild b/media-sound/amsynth/amsynth-1.12.2.ebuild
new file mode 100644
index 000000000000..872703207acb
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.12.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
+
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+	)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${P}-x11.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with dssi) \
+		$(use_with gtk gui) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with lv2) \
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
+}
diff --git a/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch b/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch
new file mode 100644
index 000000000000..24b73ea31190
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.12.2-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index e0dd2a6..9bca63f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1416,7 +1416,7 @@ appiconsvg_DATA = data/icons/scalable/amsynth.svg
+ desktopdir = $(datadir)/applications
+ desktop_in_files = data/amsynth.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metadata
+ appdata_in_files = data/amsynth.appdata.xml.in \
+ 	data/dssi-amsynth-plugin.metainfo.xml.in \
+ 	data/lv2-amsynth-plugin.metainfo.xml.in \
diff --git a/media-sound/amsynth/files/amsynth-1.12.2-x11.patch b/media-sound/amsynth/files/amsynth-1.12.2-x11.patch
new file mode 100644
index 000000000000..2222fc1eb355
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.12.2-x11.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.in b/Makefile.in
+index e0dd2a6..4449599 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1297,7 +1297,7 @@ amsynth_SOURCES = $(libcore_sources) $(libdsp_sources) \
+ 	$(am__append_1) $(am__append_3) $(am__append_4)
+ amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @LIBLO_CFLAGS@ @GTK_CFLAGS@
+ amsynth_LDADD = @ALSA_LIBS@ @JACK_LIBS@ @LASH_LIBS@ @LIBLO_LIBS@ \
+-	@LIBS@ -lX11 $(am__append_2)
++	@LIBS@ $(am__append_2)
+ @DARWIN_TRUE@amsynth_LDFLAGS = $(AM_LDFLAGS) -framework CoreFoundation -framework CoreAudio -framework CoreMIDI
+ 
+ #
+@@ -1317,7 +1317,7 @@ noinst_LTLIBRARIES = $(am__append_5) $(am__append_6) $(am__append_7)
+ @BUILD_DSSI_TRUE@amsynth_dssi_la_LDFLAGS = -rpath $(dssidir) -avoid-version -module -export-symbols-regex "dssi_descriptor" -disable-static
+ @BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_SOURCES = src/amsynth_dssi_gtk.cpp $(libcore_sources) $(libgui_sources)
+ @BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_CPPFLAGS = $(AM_CPPFLAGS) @DSSI_CFLAGS@ @GTK_CFLAGS@ @LIBLO_CFLAGS@
+-@BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++ -lX11
++@BUILD_DSSI_GUI_TRUE@amsynth_dssi_gtk_LDADD = @DSSI_LIBS@ @GTK_LIBS@ @LIBLO_LIBS@ -lstdc++
+ 
+ #
+ # LV2
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index 6ac5d966f1b7..a0865e068760 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/metadata.xml
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
 		<flag name="lv2">Add support for Ladspa V2</flag>
+		<flag name="nsm">Build support for Non Session Manager</flag>
+		<flag name="vst">Build VST plug-in</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">amsynth/amsynth</remote-id>
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 447dfc399d0d..c4011bc1ddef 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -2,6 +2,6 @@ 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
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r5.ebuild 4447 BLAKE2B 154a780256c187e77082600c7376a61ceae67aa6f33fa910475261bc69daf66931814a0688f92525b4689ef0b0850bb01b75add8aa56d7073436c53d211a4b38 SHA512 e1825d5c0c77feefb341a5f9f5bcd1b066b475b04aa95d6b02b4fa9bbc80202e8b9498e4f1eece841457c5c93f79f7581c16f6728f7f409c836b72642e46277c
-EBUILD beets-9999.ebuild 4447 BLAKE2B 154a780256c187e77082600c7376a61ceae67aa6f33fa910475261bc69daf66931814a0688f92525b4689ef0b0850bb01b75add8aa56d7073436c53d211a4b38 SHA512 e1825d5c0c77feefb341a5f9f5bcd1b066b475b04aa95d6b02b4fa9bbc80202e8b9498e4f1eece841457c5c93f79f7581c16f6728f7f409c836b72642e46277c
+EBUILD beets-1.4.9-r5.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955
+EBUILD beets-9999.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955
 MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588
diff --git a/media-sound/beets/beets-1.4.9-r5.ebuild b/media-sound/beets/beets-1.4.9-r5.ebuild
index 77bfe8273657..cc6a223082b5 100644
--- a/media-sound/beets/beets-1.4.9-r5.ebuild
+++ b/media-sound/beets/beets-1.4.9-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 77bfe8273657..cc6a223082b5 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ecdd2e74a789..2edf8a5204bf 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -5,7 +5,6 @@ AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d21898542
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
-EBUILD csound-6.15.0-r100.ebuild 7242 BLAKE2B 1bd143e32a403c31a56a60418a081494538ffe642ec17674ecac1f0f9bc88bf21152a1c37e2072cbe658b0e7797e9d4bc2c7ed07c40b69b2b10b9345543cafcd SHA512 fc4835b16a97ba2a78666389361322cfb8b494fd6b992824a6a5e7ca6450ce9ea0a3d56c4460c29831b574689e67eacb5c070dd07667cc180faeddf9aabf2eb9
-EBUILD csound-6.15.0-r101.ebuild 7402 BLAKE2B cb961c72b5876d8894b30fac74ee3bd42b3f023e8b9319be963adb2e1fa0a7bf6fddc820404330f7fa2c1bc59c642814b18c6535b7cf0a9f5fc62513867be28e SHA512 74820618ce311412b7a17b5b842f0b7624d8f5dd410ff07f689c0abcd567475ebbf3ef0f10afd5599189221ce5adf9cee41c27f5d4872aaf3fa8860c93e9b2d3
+EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
 EBUILD csound-9999.ebuild 7114 BLAKE2B 881fa5a0828fe1374c706f0a1cbdc02f711512e009c4628a171a5630bd50f2e1a49db924034d7b5a607ecda027417790a9e881b1b62d14f7b1392779c0530a60 SHA512 f02323ac78b0a30a7a0e6048036085ee5a1dfb97b4cc70c99507e55197917c43ffb0367ccd52922eb286b629acda342e499ec5f0a874b5dcb4f1234d17bedae4
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild b/media-sound/csound/csound-6.15.0-r100.ebuild
deleted file mode 100644
index 99d7b30062ac..000000000000
--- a/media-sound/csound/csound-6.15.0-r100.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-	alsa? ( threads )
-	linear? ( double-precision )
-	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#	java? ( cxx )
-
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
-CDEPEND="
-	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
-	jack? ( virtual/jack )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? ( ${LUA_DEPS} )
-	mp3? ( >=media-sound/lame-3.100-r3 )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
-		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_RELEASE=ON
-		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
-
-		-DFAIL_MISSING=ON
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
-		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
-		-DUSE_CURL=$(usex curl)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
-		-DUSE_GETTEXT=$(usex nls)
-		-DUSE_GIT_COMMIT=ON
-		-DUSE_IPMIDI=ON
-		-DUSE_JACK=$(usex jack)
-		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
-		-DUSE_LRINT=ON
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
-	)
-
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
-
-	use lua && mycmakeargs+=(
-		-DLUA_H_PATH="$(lua_get_include_dir)"
-		-DLUA_LIBRARY="$(lua_get_shared_lib)"
-		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
-		# so it must NOT be installed into cmod_dir.
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild b/media-sound/csound/csound-6.15.0-r101.ebuild
index 6705f7c34293..d07527f6c9b8 100644
--- a/media-sound/csound/csound-6.15.0-r101.ebuild
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -22,7 +22,7 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 4e91eb389b94..96ece0449a23 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -3,5 +3,5 @@ AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B e
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
 DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
 EBUILD denemo-2.3.0-r1.ebuild 2977 BLAKE2B 636fe2171f0047f4377ea349059e5222b47da692e18b10aab44ffa7f8c37218136f0b4654304284cb2e8f2de3d6234ba7a4ee626cc7afe277fb0b22880d209a3 SHA512 ba1f78313cf50f77cab4923dd11b160aae49d15de9295db7c185d2bab070a20e26ab48b6379aaaf6d121339d165edba9a7cb5c17d2032b43737e2c614221e4f6
-EBUILD denemo-2.5.0.ebuild 2878 BLAKE2B ca4fcff445b067bcd7aaefe778452077561a3668b337f065cd9e9eec4fa570a92c7fcef16983007f1b5c03912f30a485f48e4c65dd952b7f26717e941a511069 SHA512 388671d79d87fdea16da2760d71bfdf727178fdf3907c627aa8b52c39176017f4a042eea4f5fe3dd48760ef77049afa66e3b8d249578f62335b745bfbe71e4be
+EBUILD denemo-2.5.0.ebuild 2876 BLAKE2B 00d1a90e577ba541e15a9a71b5f5c377ab065fefabec6e5d6078b7449e6c3ed39f4bdfaf61f1cdfdb4939717b61e8332327130cb0212f50a45411976fb28d731 SHA512 7bf2b042085591775e8accce5522827bfbd714ce776a27a6f94760a10bcf56fefba770e4f04d5bdde758d1f989e3d02c77c58aa3fac496d8f12ac84a58c6e2a8
 MISC metadata.xml 1304 BLAKE2B c2d8fec0a0692500d9ca52e8380a3e0c81a3ee31505c06d648521a78d1bcdc2066d251f972c0e12c893439d0d3b093766c1954f2cc7c127edaf4dcfade79408b SHA512 67fecffa9ac7a3078447c7dd32a8caae6eb531e9c9c6b29d42802d72c2f2e5ca3de3bfd0d5a23eac3aff720b366377c1cff355da02672ddca448842b5aff8fe0
diff --git a/media-sound/denemo/denemo-2.5.0.ebuild b/media-sound/denemo/denemo-2.5.0.ebuild
index 12395aa35c66..76409b2502ec 100644
--- a/media-sound/denemo/denemo-2.5.0.ebuild
+++ b/media-sound/denemo/denemo-2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # configure options currently not used:
 # --enable-mem(no) memory debugging: needs Electric fence (efence), which
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index d89051150931..8066cab0e305 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.1.1.tar.gz 1959938 BLAKE2B 010072faac3819d326659421d7c2c32345f8f5cf3fdcf390b80f57f942e786d569feb19319eca21ca5346ea1f990f54353afc52ecad4fbc6b631065e7b3ed751 SHA512 764b2db79f49f1ab428f472a2f4715c1ab5a9d948af43c77befc2e758b43c604673c7c0c39779a63240a31d6169f648a8c67680c1a42891c6a6cdbd2a481f557
+DIST drumstick-2.2.0.tar.gz 1965327 BLAKE2B 1fbb97c031af319999c7fb707523c3522afff61dfba3c1c0123619ed738a4996b4b835df9f60b3bb3b27b6d13616f11619160f43cf36c8429947f43dee62a840 SHA512 eff261ae0fbb620673eaa4d12e168b8ed0cfffb3e605ad8ebbc10a444d18eb0d6aecad7bad3b0c3a639df1cfee96bece3a870139bb818a278d6f51e13418a0a9
 EBUILD drumstick-2.1.1.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
+EBUILD drumstick-2.2.0.ebuild 1476 BLAKE2B bd05362b139984277adfd03d982c2cb61bf95d34b2e85291c92ae42b0220c74066b8adcf0cd88287b7fda2a18a69783c4409684956e3b09a852023008c0bd438 SHA512 624cb7035c87f78c225d282bec57887d6bea741732d7b758f5f4a8e8781ada342ae4d0599fcea1476c66fe27b59befd98f0c0a7916ca2ab5ebb3d8283e68c9eb
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-2.2.0.ebuild b/media-sound/drumstick/drumstick-2.2.0.ebuild
new file mode 100644
index 000000000000..1459d1b265ae
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.2.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth pulseaudio"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use fluidsynth ; then
+		sed -e "/pkg_check_modules(FLUIDSYNTH/s/^/# disabled by -fluidsynth/" \
+			-i library/rt-backends/CMakeLists.txt || die
+	fi
+
+	if ! use pulseaudio ; then
+		sed -e "/pkg_check_modules(PULSE/s/^/# disabled by -pulseaudio/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DBUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 2c8c80ea3890..01fd46c3f239 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -2,4 +2,4 @@ AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d11
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
 EBUILD ecasound-2.9.3.ebuild 2340 BLAKE2B be16599cff4b41652b65b9b9f37b7b7d9fbc625740f87004df93730a5afc3b64a4901f10d7816a57caf8144ac22a5a464258fcbaa2ddd0663f884f0307985f48 SHA512 d08dc25457937861a8d21ba0ab16a5c3500bbf15407a64ab4c019054e6908f7fa458a64de0ec2420cedc7c1fa4b6cb6a73512a128861f4f46317e2d66f03464a
-MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c
+MISC metadata.xml 1073 BLAKE2B a1605b17feaa2bd6baafa85ff20a116bf1f7e214a1e0d76ff72ee6bf958067314b5595b666539e38a091f231dccf44ce67defbc05f8761eb5c61250d99102a73 SHA512 d46768947a990c8e5c7a53e4f40138d0708504d32e32040b4802b4e4a7d105d3cca25eddd6b3da64e71c8204fee747ae23d28e276db08e03fa1fa6940a2ebc8d
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
index 7a9880111e68..5b03d2766abd 100644
--- a/media-sound/ecasound/metadata.xml
+++ b/media-sound/ecasound/metadata.xml
@@ -20,4 +20,7 @@
 	<flag name="oil">Use <pkg>dev-libs/liboil</pkg> for inner loop optimizations</flag>
 	<flag name="lv2">Add support for Ladspa V2</flag>
 </use>
+<upstream>
+	<remote-id type="github">kaivehmanen/ecasound</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index b509c34166f9..f4b0770298d2 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-20.12.3.tar.xz 1661968 BLAKE2B 17f7bf9bf589f19d010fa644c54d941647b3ed267c84ffb60b47ffcba27f28f0e639df3211d92ca27556e8887a9e83db3efa92739959c38e2051db79de6b2f4f SHA512 8fcf91c5421596a90e52329ab9d0f47cd5d4432f28ed1cede9f5e0e46f77124dd2cf6e2485fd184437034d3fb0820daeda3f8ad488e24637b97482ac3586c4ee
-DIST elisa-21.04.0.tar.xz 1718428 BLAKE2B a7331a75ed1986babbb6c4385bd45cb7f6e0b0e6fa97e3c747bbfaea8e7e7e5839bf28528b494b893700ce92a808c4decf0667c1388ce671e893bbce90f75ff3 SHA512 97aabe4f08b45a22217b44cddff808a27f76340f429e19d9b46ad316983399235baedc836b6ceb5264d95c3ce0b8a9b45bf33538dbb70f0cf03b4d571d5f7ffc
-EBUILD elisa-20.12.3.ebuild 1660 BLAKE2B 9d162f7d0e730215d80f90b7b70d48f6402fc23fc5e3cad20f4fb06e69999ac199791e7c2b1e33c7adb3968406622b6e6f2fb634bbfb04d8f1cefc59cab61dcf SHA512 74c6c0347bebfaff5a7570902d86d926f98788d88c72a54f8d561a33b6658ea3b5625e182c2d207e5994cd25c2db8e96f69dd15da9abb99cb4eec0d7bf2a9f60
-EBUILD elisa-21.04.0.ebuild 1652 BLAKE2B 66d4462d895aa40155bb3bac978328f0175e8ed4b29a32eef210e532ab2c0da56baa59180ad559e91508a45e4eef79cdce11044d25b636391bb99367f0e11b44 SHA512 2e579e5f6d226834829cd497a8099cbc7cd470f2ea18d7c0cee9ed3967545ac858dd508129ca8eff9b13f61bb37c9117af20565efe77d0af0049029d44885ca6
+DIST elisa-21.04.1.tar.xz 1721592 BLAKE2B 35ccd0144b4aed2f143a901e004b0e1fab025db2abf6fffc76475a8cec95b475b5d9a291a4567dfe38148681e64986eb7c37d3d7e21d3ffea1b1a88b6e3b8ee3 SHA512 d9c042e2ed0458c35ca07e5613a09aeac7b9fe1c89e5312f7f623805e526b2d34cf54b62ed1563d188c87b2679c42a1791feb12f7e83264253e5dfd5c3e4975c
+EBUILD elisa-20.12.3.ebuild 1658 BLAKE2B 4351d92ef0d8902ff9ff6435161f79580327b31a21add05d8a90978a4724e8bc5d6e6720772f46f14c0f0fdb6076ae9f2d86f23e1a21327dd7617481e2ecac52 SHA512 2ff5520e1c11115a4ccdecfbacadefdae94be53155f742e03c579ce1a9daaafc34ac22dd8a898183403788250e9076debdbba82defbdb9a2d69475352a002979
+EBUILD elisa-21.04.1.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.12.3.ebuild b/media-sound/elisa/elisa-20.12.3.ebuild
index 0a08080cf434..fc3e8fc8220c 100644
--- a/media-sound/elisa/elisa-20.12.3.ebuild
+++ b/media-sound/elisa/elisa-20.12.3.ebuild
@@ -11,7 +11,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
+HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/"
 
 LICENSE="LGPL-3+"
 SLOT="5"
diff --git a/media-sound/elisa/elisa-21.04.0.ebuild b/media-sound/elisa/elisa-21.04.1.ebuild
index e4e94b55b120..b7ac1e0751d2 100644
--- a/media-sound/elisa/elisa-21.04.0.ebuild
+++ b/media-sound/elisa/elisa-21.04.1.ebuild
@@ -11,7 +11,7 @@ QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
+HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/"
 
 LICENSE="LGPL-3+"
 SLOT="5"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index e93ef6f2b5f4..305eb6bcf370 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1,5 @@
 DIST fluidsynth-2.2.0.tar.gz 1507709 BLAKE2B 4ec162ecf461f3fbc80d1b5c1a4bc0624d8274dedcfa32addfd79d7270811e532bccee46b90181bca504183e092176652f6c9d0ae8eccfb5617b9176b8bc511e SHA512 fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
+DIST fluidsynth-2.2.1.tar.gz 1594153 BLAKE2B 9a297859ae90e3dba21a3923059c081596d2a5ff107219b829f75e2067bea315364c9b4a9a4e6563c5a9f9ded92efff2c58d1aef9840b308fe69f546797c83ae SHA512 a42728f179fd2583a292d18d9b7d98498b42574aff6559e8e3762329893dd18c451b5611517aa9aa7ee6ba9fc0db3c83e127d097c68769c5d8562a49dc427ee9
 EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
+EBUILD fluidsynth-2.2.1.ebuild 3321 BLAKE2B bb22fcff64287a4d5e9ac3a56821627974fb6c65aa252ebf935c9243e49d3bbd858ee7847c1797892ac8f3c02541e880a677801baeb51b089064ce89c3b01265 SHA512 3fd862663ab056ffb93a46b297f505958384e33aa786110cbcb63574bf3dded6aee123f98edeff2cc625a00fdf7f72b29048a33a1fb466d9fbccfd9de1cf163a
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
new file mode 100644
index 000000000000..781c4e52a80f
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index c5ac9af03735..d563f55a1a43 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,8 +1,6 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
-DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
-EBUILD hydrogen-1.0.1.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
-EBUILD hydrogen-1.0.2.ebuild 2083 BLAKE2B b36cdff0452c3ec66d1c9fd82c4034453e32d20579a457d80c4100d949bfb1808a5c36e691c3fc25219ea6d9a2015b47469be09b8b86d7ecc9f0e313435951fc SHA512 f3ee351abc26d81433111860f3b2c256c4b0dfae180fc8987ce4327994604a81c09b810b4ca23a981c1dbc2be4d63f3d38ec75d218423da23c92461a6dd57fa9
+EBUILD hydrogen-1.0.2.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
 EBUILD hydrogen-9999.ebuild 2077 BLAKE2B d44f7d81977b4b8a755c0aca634bd6c6da2f7199c59f21928efd606bf3c12912fc2f1861e06725e80ee2bd849a6a366c78e039629cd25ef9e7454799f663f893 SHA512 8e8eea2232f41416685151de940dbdf634491ea3c36315816430a75b38a92c2a05fc4f4e12f8d8d4454d50a2ea37c3d88b6f059e0c4c256faff457d04a669f4e
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/hydrogen-1.0.1.ebuild b/media-sound/hydrogen/hydrogen-1.0.1.ebuild
deleted file mode 100644
index 5b62655b32e1..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
index 69b4555df1e5..5b62655b32e1 100644
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 3a3906160ea8..822f3c63d0a6 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,5 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
-DIST jack2-1.9.17.tar.gz 975827 BLAKE2B 7841f2714dd2fe72d7f5d72fd93a24a63b75143d81bed5166d8b2b29af4acc487157f78b26290aacb45fb2a2c82c18156d8fb45f49bda8780cb6938ae72ffedb SHA512 dff611273e23cea6fe258114c65e193f01dfa0366ddd4e6a026a3d676a32002ee744bc70085fb8568cb85395399072beec2c7f7eed8d9ec912332a2a56623521
 DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
-EBUILD jack2-1.9.17.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
-EBUILD jack2-1.9.18.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
+EBUILD jack2-1.9.18.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
 EBUILD jack2-9999.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.17.ebuild b/media-sound/jack2/jack2-1.9.17.ebuild
deleted file mode 100644
index 0e31dae3a2bf..000000000000
--- a/media-sound/jack2/jack2-1.9.17.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.18.ebuild b/media-sound/jack2/jack2-1.9.18.ebuild
index 3001f60267b3..0e31dae3a2bf 100644
--- a/media-sound/jack2/jack2-1.9.18.ebuild
+++ b/media-sound/jack2/jack2-1.9.18.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index f645f905a378..50db1101582b 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,9 +1,4 @@
-AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b
-DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-DIST ncmpcpp-0.9.1.tar.bz2 474436 BLAKE2B 89f6a6d68baf54b0a0eca6d3df96dcd5bcd1346e6f93d0a580f2fbbe4b4246218b62e5332f3db2567c9a91ee30ceb367039a328fa7f491c2a756c2c03fed76c3 SHA512 8fa9f512ac09c144eab4e4721a9c54f3f411593fe13c26db12fbaa3ccf6b08d7cd54923e1e4148b2db45dc69431280611b2be2d153513c0d38eaf92af8ceb9fb
 DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1460 BLAKE2B c8b146f78c34b24fc9daf1f236c9dbbe2f9c02c2da1f758dee18cdf010c7af7c8482d52516af87c843a809ede79dc4395becc57669d31be6c402c2b0430f32f2 SHA512 c781f50146bc50994010e116a9697ddd47efd13afd5ecc5c772530fce3f7308f14a3cfeb53979ba4fe5905109c6fa591422320873b54b8a5dfeded7c826c3d77
-EBUILD ncmpcpp-0.9.1.ebuild 1418 BLAKE2B 9088316711d5675c2e95d4f8755ca832a3a3487ccf84c40e7fdf219c51eb70fdcbf1cee7758f13f9163895e4ddbbfc4c8b4bb581e1fa306388ff6655b6e9cb2b SHA512 785451382a490c876f25bf5351fb5bbd1a0b62519522d491d7cf85cb3e887bc57e4a79f6100d09eb03a9e53ebff1885822c9d0f01b4cd51340c60f09289df815
-EBUILD ncmpcpp-0.9.2.ebuild 1418 BLAKE2B fca54614cb0895f83ee09ebda22e8ba7252e25663931141959b3c8791292c681a70247de0b6545ff2df65e6c4e282801c4b5350888ebffe3a3bf96d2aeb94914 SHA512 85e014a82123ce1f97484622313472d04073401298770889707aff6b0446472223c88fcdffde79e7f54623baebc7bce8cee0e41407ddd1b44293b378ae31c4f9
-EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B 02aa9bc5abdba9b6464e55f95fafee07937954523c0ecd8c39a03c1fbef6c371c477e6a4d0c0d5b3d71bc51e38d5d141973733de796721f219484a01422cd072 SHA512 bd3d7d50ff46bce31d075372002f9de5a2f977c25d4e68c06c8c1a4110fd9db8d0543542133f90eb279d20e7c36f461aab982cc4ad4e4238cf512b245a8af352
-MISC metadata.xml 1094 BLAKE2B 03f876dd9fec08222052e01b13575058faea3ed2a0295e6fa09a3975d0490b205b4f7ef11444d236a37ad05dac2ed13956417379fa553f699865a583fda8457f SHA512 7736907dab3e73de891816987b8254d41013ec44641ac0f206cee5c3d12d7312d94a32dab44ca072c0fa1a770a702c29ed535eecadb39cdd1b34c5ba4802bec7
+EBUILD ncmpcpp-0.9.2.ebuild 1486 BLAKE2B 9c28655e8aeef191a76d4aeafebd69c99f73fbd485c7a1692d09118bca32a10c402509cebb458301d228c8029e2da438c2e3fbb4406d10a3b8f1aa8e151c6180 SHA512 4af98cbc005c50a3a4a2abe39a2eb2aa62afe690e5dfccaf93e829cffa79a020e42b017ba6a9ae7945f5a3df1c7032213b3ded15f967e2c26da9ec5135e5b9bd
+EBUILD ncmpcpp-9999.ebuild 1458 BLAKE2B 65b2fe74ea1aa8dee94d8fe2c24cdbc94e0aeec663b527800004a6b74449db49a7c633ff97020d91412defff271e39e3173ebd66254d85c234e5c3b84811d221 SHA512 4f82b7b9027876fa4c569be40c272dea2f8b5e9e2006ae2291eafa850467ce1eb5f3d40cffc5ae1bdfd45d05186a3c50c5f11e7330e6658c6cdd7685d7190e3a
+MISC metadata.xml 1154 BLAKE2B 9ff9271cd1c5345641c83009c7db03a381c9653f3bfcecd4b7018029d9f89795297cf1138ce0e04632f9adeb68eb01281e04d5559cf0780b3b416330b2551cc2 SHA512 7021e28e39780017c7b4bf58a4ddd94f7142120a68c36ff7e1656698a0f4135204a50a43e108601a51d86c4eed22fdde5a9498884dcd89ffe2547090a7581c9b
diff --git a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch b/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
deleted file mode 100644
index 466abceecfe8..000000000000
--- a/media-sound/ncmpcpp/files/ncmpcpp-0.8.2-gcc10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Sat, 9 May 2020 14:31:52 +0200
-Subject: [PATCH] Fix build with GCC 10 by adding missing include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following error:
-./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
----
- src/mpdpp.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mpdpp.h b/src/mpdpp.h
-index a2bb79eb..abd3666c 100644
---- a/src/mpdpp.h
-+++ b/src/mpdpp.h
-@@ -25,6 +25,7 @@
- #include <exception>
- #include <random>
- #include <set>
-+#include <stdexcept>
- #include <vector>
- 
- #include <mpd/client.h>
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 9730a091cab3..c43c71b33657 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="clock">Enable clock screen</flag>
+		<flag name="lto">Build with link-time optimisation</flag>
 		<flag name="outputs">Enable outputs screen</flag>
 		<flag name="visualizer">Enable visualizer screen with sound wave/frequency spectrum modes</flag>
 	</use>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
deleted file mode 100644
index ae5b5d47d37e..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc10.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw)
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${EROOT}/usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
deleted file mode 100644
index b5189ed27301..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
-SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock outputs taglib visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu,nls,threads]
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/ncurses:=[unicode]
-	sys-libs/readline:*
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw)
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${EROOT}/usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
index 9f375cc8a75e..1dbf262713ee 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
 SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock outputs taglib visualizer"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+IUSE="clock lto outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
@@ -34,10 +36,13 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-flags '-flto*'
+
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		$(use_with lto) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 74f29afe4abf..8ecc1ec6cb42 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,8 +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 autotools git-r3
+
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
 HOMEPAGE="https://ncmpcpp.rybczak.net/ https://github.com/ncmpcpp/ncmpcpp"
@@ -11,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="clock outputs taglib visualizer"
+IUSE="clock lto outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
@@ -39,10 +40,13 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-flags '-flto*'
+
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
+		$(use_with lto) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw)
 }
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index fee1281013ea..6c82f63bcf93 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.8+release.autotools.tar.gz 1474083 BLAKE2B 5519f2c8d9d4e02e32bf1ccd28a89fe547b1a4ec79a0be209a872db5c7e2eb9ca3e1a9fec820a13492bb14d1413c217654a5cbafc79bb0e041dbf2f6d27d9ca5 SHA512 29a5b97495c2fa9898cb806cbdc1bac3263b30ecb9c02860e9f7147dc1186d7600589b5f44c9b1aede9c9d44add3521e28e1ff6a9299227e8b19361fe9cd7cc2
-EBUILD openmpt123-0.5.8.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
+DIST libopenmpt-0.5.9+release.autotools.tar.gz 1475064 BLAKE2B 0c7675ac723b10e879f0c7282a64bebb4fc489cf7ff8dd7fca8da2739cdcc89bed52da9d5bfa24e7c2e6eeb1a55b1e09d84dfc625d8c5b2eff6300b37b44d882 SHA512 993a466a508698a673fbb5b397493b1b75da2a96e3139c5d726546c999169d03fa77a96256721192d869b59e58c938d49224b08bcd0056ad3f78874dea9dcd21
+EBUILD openmpt123-0.5.9.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.5.8.ebuild b/media-sound/openmpt123/openmpt123-0.5.9.ebuild
index 386c068f1a59..386c068f1a59 100644
--- a/media-sound/openmpt123/openmpt123-0.5.8.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.9.ebuild
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index e0cf9703b7ac..691d4eb54135 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,6 @@
 DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
+DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225
 EBUILD picard-2.4.2.ebuild 1625 BLAKE2B 9afd5a400e7d21531feef4e19408a499a56d5c886878dc8ca1df5c84ebde5e71b5e4102395d480696668bfd7924db39484fe7560258b92c392d9d419f2f59345 SHA512 aa8faa116dbf15efed632e8b568201e8393bbed55b5e80d0a8f23d79ca1f7c2b31a04fe871b8111fbcc5c39ab3655e99969c3e033d5b77cb53a757b99099f946
+EBUILD picard-2.6.2.ebuild 1674 BLAKE2B 911eed027504dd2790676c53d15017d94b4048b3859e929abac5b80f1bd508b2e7d70eb818a04b5532680deb170e556118027b558d94c3472fd1136339fee7a0 SHA512 2e34914d25ac29ef661bf1a9b5134ade25316d1c3c6d98e9ccc44136d25a0cd25a14301a3ad84be54db350f5187da1716e92bb9e6d30db0053041776f22efaad
 EBUILD picard-9999.ebuild 1627 BLAKE2B 4472b2464100cc9493cb7e2abaef8d679d114d25be7ccd6beb6ca5e1a0f59c1e5ee908ba879e3bb71456a96db4e670a48eb1362a85b07d7d5ed531fc2e0119b4 SHA512 7e5e7198a0a4364e9d475f614be644718c5fef09213eb14131f6e544186b4aeda8f4c0156659ddd3962c3fd4ed24052d35e83228f43c98e8f44df8a60ed6392d
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.6.2.ebuild b/media-sound/picard/picard-2.6.2.ebuild
new file mode 100644
index 000000000000..c395e2d4e271
--- /dev/null
+++ b/media-sound/picard/picard-2.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtgui:5
+	media-libs/mutagen
+	discid? ( dev-python/python-discid )
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "If you are upgrading Picard and it does not start, try removing"
+		elog "Picard's settings:"
+		elog "        rm ~/.config/MusicBrainz/Picard.conf"
+	fi
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index c7c189aae00e..843d9d81bc15 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -5,5 +5,4 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 EBUILD pulseaudio-13.0-r1.ebuild 11386 BLAKE2B 31453bb6059a4efdd9d0c618534ee478407ffebda0cbad0d2b2e6d20735f5c24cac46fa92411c1a22a6d3261b798a3510e6cf426c456ca9c2b8c46a753b8653b SHA512 7be9fdc6e354bef9d039a43192a2626fea1887fc3067d973c2328237e288f2fc103ca7c8f914d495827401ec6f9f2b8bb69ee9306626f083b906c0118b949823
-EBUILD pulseaudio-13.0.ebuild 11509 BLAKE2B 5468e027a01586d5e765377513d6d521978a8683e7cbdf5c3b3d15dc56fefc874a94ba8be4bbcdc81a43b49b292170a0176eb777084940da5b35f71d46c250cd SHA512 fc72ebbc54614cb935134a7a03d9c05414f46f5aa41cc59756ab0567187fd6955a8e6780758b7d7dad85114f32e16b47fbb280271424e2a4c809bfc88caf2e78
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
deleted file mode 100644
index e2dbe303918d..000000000000
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs user udev multilib-minimal tmpfiles
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate lirc native-headset cpu_flags_arm_neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:0= )
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-RDEPEND="${CDEPEND}
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( dev-util/unifdef )
-	>=sys-devel/gettext-0.19.3
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable cpu_flags_arm_neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		local PKGCONFIG="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
-			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 8f9a25aa1e94..8ec3033781aa 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,5 +1,7 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
 DIST qjackctl-0.9.2.tar.gz 1093486 BLAKE2B 43e3f3d48295727d7a3848ed6c59c72fb6c2947476720af802d53d152848a355aac79448d88fce78c2b12fbae54d64b4a1582f334b2a416f0b235cdf8d557e40 SHA512 87e5cbf241139b1e225ea2e2cc45b6f44f19fddf866560e5b9e690ef3a2f7a358ff6a28065841c9599b321568a85d5b4767907aff071c4a768608fc273a7e8fb
+DIST qjackctl-0.9.3.tar.gz 1093889 BLAKE2B e3fdacd8fb287e56d53c1b4afabf69aae89a9c311c1f056ae0f2c0f2c7e994e320a904d9ddd40efd48ed7b15fd7d90ed6ce07adc0db496d133431b1519c83a86 SHA512 bfe1cbd37ebd92409f5dd7e8a28115b9922bb43ad0f38112b140c8635a33cc49614202b9e4f92d57e58ed83a85767f53b538a7e6b69702b159157868081b3435
 EBUILD qjackctl-0.9.2.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
+EBUILD qjackctl-0.9.3.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.9.3.ebuild b/media-sound/qjackctl/qjackctl-0.9.3.ebuild
new file mode 100644
index 000000000000..15137741a070
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 8dac75abfa18..f931bd2ff2e7 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,7 +1,9 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
 DIST qsampler-0.9.2.tar.gz 283494 BLAKE2B fcc5a39e5f8069ae79e6e7f1df27c49f5c27573dbd8f937fe699e1cfd7149600eaa1e697cb86fa446a795d949267c92340b4f40868c9847eb493409126a94cbf SHA512 dcc06fbb66f9f7caf04359ef2f75510666214452251a005605a5235709f2846b3d58ee8cbb82f18f676d079d1484b91b7c3efc397fdc99e84ffaa1c95ccafb4c
+DIST qsampler-0.9.3.tar.gz 283882 BLAKE2B 1171de42c7f27481a5e2f95c1d868b68594288d3a640fe118df9a7f1588d0fea73e06bad4d3acd08a99ec4ccceaee7d171a047a96e811be09ebb3c48896e064f SHA512 0abfcb35aafb773d1b0f2c31406ea7b04581a4a47b01074c70d1b4833a3f06e8223cfa57b1e7f0233bc347636f41732db37150e5bfde76ccaad4eb959428a7ba
 EBUILD qsampler-0.9.1.ebuild 1142 BLAKE2B 300be269a1d3a1f7fe9de4f005f4e4ad5da41e389785e3ae4f7f9e37d28d4a8e86e87b63670e53b51b43121fc96dbbe8915b54fbff8d1e7187a2cf952894ae2e SHA512 6ec6ea3673602e1c02cc12fab0db591c12519a012503646205369df95ce37bcf5fc8d95cc210524da871f1e7a9a8be7e3c4268ef25f4d11322daeec0a6256d36
 EBUILD qsampler-0.9.2.ebuild 1150 BLAKE2B 7eef5a0385db52a6a8ecf942bfa8b18adf797c9c62c45b3dd53e7901a8dcedfa33a9ef51c9f75fc3e3a979f9efff59a3e9815562b907392dbeaeb8af03214295 SHA512 96fddbb2518d4c28d14ec7bdc37490110d3399f0160154a170e9671d71245ccd9a5bd1cc9a92df9d0e04716a454579c13ca18a417996a0cca0624845b1b12675
+EBUILD qsampler-0.9.3.ebuild 1150 BLAKE2B 7eef5a0385db52a6a8ecf942bfa8b18adf797c9c62c45b3dd53e7901a8dcedfa33a9ef51c9f75fc3e3a979f9efff59a3e9815562b907392dbeaeb8af03214295 SHA512 96fddbb2518d4c28d14ec7bdc37490110d3399f0160154a170e9671d71245ccd9a5bd1cc9a92df9d0e04716a454579c13ca18a417996a0cca0624845b1b12675
 EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/qsampler-0.9.3.ebuild b/media-sound/qsampler/qsampler-0.9.3.ebuild
new file mode 100644
index 000000000000..d948252e61b9
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.9.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake qmake-utils xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +libgig"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/liblscp:=
+	x11-libs/libX11
+	libgig? ( media-libs/libgig:= )
+"
+RDEPEND="${DEPEND}
+	media-sound/linuxsampler
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-cmake-no-git.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_LIBGIG=$(usex libgig 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 1ddb7aea1081..dadf99ce401e 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,9 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
 DIST qsynth-0.9.1.tar.gz 393897 BLAKE2B f63766614d821409cd12e418e36b8dbd739da8e2cd7deae91c2b00dd4f5ba2f447a3ca19c3829de3282e368baa37567333be051641221300d13dd7948d762008 SHA512 70bba332b90963d1c1da18fb3de8f05544fed3406c2144b6ed78cf93720cbcb684ff367d7ef4bc80be94ebea060b38753ae0cb183e85f96f127014c08de701b0
 DIST qsynth-0.9.2.tar.gz 394009 BLAKE2B 9560efe95992fc6e992871c8057898e1acac46718534c7e79060dde4d1519f9fd4798385812f384c97a764676e3e1005ebe24708545db3dfb9f8e08973f07441 SHA512 ab9a2268e3926439e4784c8dc2511d7c39aa2bfb97ffb7bb34f6761f1e859d1ea53f9f6da4d5c31395c6c03dc250b74c8c250b5d71321f2a151b75ec636be3d6
+DIST qsynth-0.9.3.tar.gz 395265 BLAKE2B c19154ba02680ae784ea016bbcb2dcd6c3517d6e810d76cc16919508e2e7310d23a8e8397f45340c138f018340525ecae8d941ce5acf5d4e16295e88d3450069 SHA512 7da5bc0fd8feed6b3b0b048e7ac3fa86937d82ff34528fd0dbb1dd5a05fbff2bb2d8e360e499325660172acec7216964ce1442b75afc10ab0647b91376b2c421
 EBUILD qsynth-0.9.1.ebuild 1404 BLAKE2B de7309360b92eb8003cd2f875acdf499a9d03e0f89f6761443fc23ad0a0ce9f04d05d70f4813c46be61703e795a8c1c3b7ee435e8d644d6f2e0a72ac9fb9aaef SHA512 b86b7c6e5411ed28ce4795a37df8111d289c27ad2cf0fbcce2de54f6fd6fbd709b1a4e47eaed4be1ed9e466649c72fe730df1ee437f7b75ad6b0a76389666329
 EBUILD qsynth-0.9.2.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
+EBUILD qsynth-0.9.3.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
 EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.9.3.ebuild b/media-sound/qsynth/qsynth-0.9.3.ebuild
new file mode 100644
index 000000000000..59c6e5666ca2
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop qmake-utils xdg
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${D}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index a2e05773c8b8..3647931b739a 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 890 BLAKE2B 449553d45029499af8d185e9e524674f035841e5e36fc7acb8781c82b4cd8f804c87075dae592481294835cddef2a40dbbbd7f9ca7e507e6191680b25d19eef9 SHA512 bf1fc12e5da4b1106ee3a84d510c255fc9b4ab9f1a59c1827b1f81df3ede0cbd0916f5cb95d04872b7771ddc03058ea6d7a16c826e4bb5afe42438f0347b8486
diff --git a/media-sound/qtractor/qtractor-0.9.22.ebuild b/media-sound/qtractor/qtractor-0.9.22.ebuild
new file mode 100644
index 000000000000..56455102cfda
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.22.ebuild
@@ -0,0 +1,103 @@
+# 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/rip/Manifest b/media-sound/rip/Manifest
index 50452e5f8319..f5d7fff5d631 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,4 +1,4 @@
 AUX rip-1.07-change-to-gnudb-org.patch 1080 BLAKE2B 5a2af422e44dff3a4641a0f51979fe3b9c3c4aa7ffd88756df0080d778c84ae6f4245037da25ea0db05ea75ef70744983eb14e260a6b4b25354ed0479c0383eb SHA512 6cf3bf8221484dcab061f3fa6ba0db3bd6c1531715b87f58492e6185518e62632478ac5e9a614f652a1cc027c8e6d686a7a20d2a3dfd2f5e64c578bd99f5bc7c
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07-r1.ebuild 645 BLAKE2B 8f91fe9eb0d1863d4e1af8cc033673dc91b9c7c8a20d70124298a71e47f1703cd19e6d2dbca8d3f23150bf8eeaaaa3705390802f8b5e5a7ccb3a5778827034d3 SHA512 9ea6bc21e46a385d14afaaabcdd0f7fd424619e94d4a77af513d6cb5636f377fdb52b86816c58788bbeeb17de67f831a5c734e3474eb937211e63fc74cae9d68
+EBUILD rip-1.07-r2.ebuild 660 BLAKE2B 17ef7f440d2c02871ec71fea5077fef192d7680e11e4ae9d0df0076cbfda1c612f9863fce88a40f83e5b5d986dca0a028c543125ae90e24fac046cac60085305 SHA512 e0a9e48d75cabc945bc93e925e35d4b213f2452d63b137d636745297780b18c4cb3cb3acf0a18bda13c0d4c6d6fd9c55f350eaced8a0da098f79fc32aeca2955
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/rip-1.07-r1.ebuild b/media-sound/rip/rip-1.07-r2.ebuild
index c84749041b37..e53e18270c80 100644
--- a/media-sound/rip/rip-1.07-r1.ebuild
+++ b/media-sound/rip/rip-1.07-r2.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,12 +11,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-RDEPEND="media-sound/cdparanoia
-	virtual/eject
-	dev-lang/perl
-	>=dev-perl/CDDB_get-2.10
+RDEPEND=">=dev-perl/CDDB_get-2.10
 	>=dev-perl/MP3-Info-0.91
-	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
+	dev-lang/perl
+	media-sound/cdparanoia
+	sys-apps/util-linux
+	|| (
+		media-libs/flac
+		media-sound/bladeenc
+		media-sound/lame
+		media-sound/vorbis-tools
+	)"
 
 PATCHES=(
 	"${FILESDIR}/${P}-change-to-gnudb-org.patch"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 7d65a803c35e..ae5f112e2264 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
 DIST strawberry-0.9.2.tar.xz 9956324 BLAKE2B 0b5ccfa76aa98c0d7cf5ca0f79465948c34d6c7e7f51264b1fb8623099a4de2d0548464f51d813a4b75b8e524c653a32e8682410741a3c3fbc604ccaa4816204 SHA512 2ce22e7bed5832dc33191f5ff6f0f656861f4e574ad5ae2d2987a0c75274490dad2723579fcc5766f398654600a0819c5d0fa956dce12a54d5aab505a2f1ea30
 DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
 EBUILD strawberry-0.9.2.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
-EBUILD strawberry-0.9.3.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
+EBUILD strawberry-0.9.3.ebuild 2937 BLAKE2B b206a72e4066488f8e7e5a0eccffc47074f689898984bbc82a2874aa1f764d678a39739bc284aa8e6b6098974df0d2ad0752d40532828e7eb50dffbb3ee71a59 SHA512 d2b2d03f06db0209999a4322149122cb32759017a34fba8846019d803b0e0ee38154c5b807a19ad7972e95364de3976dfbaaad67c4600568ba0c3459d9b73241
 EBUILD strawberry-9999.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.9.3.ebuild b/media-sound/strawberry/strawberry-0.9.3.ebuild
index 9735f0e9a08f..13ec62aadde7 100644
--- a/media-sound/strawberry/strawberry-0.9.3.ebuild
+++ b/media-sound/strawberry/strawberry-0.9.3.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/vmpk/Manifest b/media-sound/vmpk/Manifest
index 3a0972593550..6eaf161e118c 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.3.ebuild b/media-sound/vmpk/vmpk-0.8.3.ebuild
new file mode 100644
index 000000000000..8c7430f56134
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.8.3.ebuild
@@ -0,0 +1,51 @@
+# 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
+	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/xmms2/Manifest b/media-sound/xmms2/Manifest
index 7894b1ae4f3b..bd63bb29492f 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,5 +9,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r8.ebuild 8269 BLAKE2B 057ffae93e91774c50babfc125d80a2a0e14b9bf65ee0a40a6dd104a0ef7cc2bf4242a9e86c1281f46b1f4687a51588f818b7725a21141a6a56a3d5e55368907 SHA512 5960e9c7f1e951e855c1d772b59eca5b91ee3865bfe7cab3ecc5d646570c9045b6c90fa737654176052fbe19314502cc2731c4167f2b470bdf08e1d9c8ba994a
+EBUILD xmms2-0.8_p20161122-r8.ebuild 8272 BLAKE2B aab42ce7f2c0c35c39e840f54d51f47d7648a0937ea15c6398a417a124ce63197cb82a0059408ef343075fcd318573e470d336a13c0018d4a8da23d9b7cced72 SHA512 a30285032c694e99b90ed8c2eef973f91b96603f35546c9ce58abef4131e4caaeaad2d94953a95185b2747f56f005811020b2c479cc57ac2f9ced02904583f9a
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
index f092930f7a2b..11574d0fe0a9 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /media-sound
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)