gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /media-sound
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
116 files changed, 1730 insertions, 955 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 99730408bd33..f86b64e61795 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index caa06fcab35e..a3010554deda 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,4 +1,4 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
-EBUILD alsa-tools-1.2.2-r1.ebuild 3413 BLAKE2B de2a4379b262ae815828dba0ade2ea67374a619c09946ca8fb56489fbef3ddb38490fc87d269ad694e696e0bfa49e3f11eb21964f024deed55dacfa0efb83fbd SHA512 8697d2e9a4245e20c7a44c4feccce91ec5506288a6171d1a765bd60683f3253a9535c70c21a024f57e4ec4eb25d1672470881f7584953ea7b9b3b98f19617f18
+EBUILD alsa-tools-1.2.2-r1.ebuild 3427 BLAKE2B d82cac5f95da90ab930cbf1ba96ba3bc3c00f5453cb80dd1672210628fdbcf0a3a1f14b578e56ab89a058edf0e33305ccceec21d3163b4ef628355f0adc34dec SHA512 c77460f347017900b62532b4a65bae9c5a858a7ebe9c329dd6c75333dd1d1f66455d6401c2f558df8cd4d8e9e90b3b06ec4e7645657810b4bda8b15f85428b7f
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
index 4686591d3c14..90f3ebe67707 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic xdg
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 880f5a74f6d5..9fe73fb22571 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,13 +1,15 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
+AUX alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch 1663 BLAKE2B 15f3778401410039d30aa93c12f17a7b9581474a7b1f2cf9cad743992b3b7ae9df65810af842d5a00f36d62e53cde51cf2c6ba8d41e1aab7e0a089a4396fe841 SHA512 2b6f0e6c6e68adff98911547d6b5372493d313ba1f7ff16f845ebf58d584a83916b213c3aeaef1198f09808851b01dd533b2d85fc7b72032843319ab60a707e2
+AUX alsa-utils-1.2.5-fix-the-nested-iteration.patch 989 BLAKE2B 5f5956c72a0e9605011b953f98ae29803f50e0c427c794331d1b99e7c1a4dc81379a074a1403ba71737cf8de03c0d749e4544a22a8e2f39984ed9dd6482b40dd SHA512 0cdc8c41b70be714515f355a630fc28b68b95cb7b5a5cbb58c1b288ee0edf3128eb8f80bb874844cf11268c89bb04e82f1fe8c4c1ebb7cd7334d28f2896d5a85
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
-EBUILD alsa-utils-1.2.2.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.3.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.4.ebuild 2335 BLAKE2B 001e48c41114d82be491c59c42f04d351bc2949498e4bcb6c29cd9697206ff76c93c76bda22528f6c7745eae05f5190d7b3c6ec2472b2e6506a4e829261ead57 SHA512 4e47c7a7db56f528aa524376dc365a9daf076f65629262d962ebe6878bafa8b6cc5a3975792fde7a71a9c456001ed3e9836a9026bcb935b8e1deb7748770c27f
-EBUILD alsa-utils-1.2.5.ebuild 2341 BLAKE2B f1d3124447c60c824dac7c2e9b4007ba93e5eeaf558dacedb344a4a6d0b18d3e7be5bf7cb2b8f99f1f6d07e62da85cbfcf416a049030d3edc2c74b62b5185546 SHA512 2dfcf714a7d865085086b742914c2faeb036825273bef722351ed9219ca074612e7745afd8b11a20a58e1e8999f71d28744992d98b4c3bc9cb9df438d5c66b49
+EBUILD alsa-utils-1.2.2.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
+EBUILD alsa-utils-1.2.3.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
+EBUILD alsa-utils-1.2.4.ebuild 2348 BLAKE2B 0b51fb69c74f99f97c623fd16bed5cbe310aa16a3e1801206b2fb4ee1b66aaa67e9cfa5fd23457b700adc2eb7d337f429007ab9166db0a63f39a8916baf99d37 SHA512 ab75b6e5a55e3488bc436d293354edbd6f135047be7871123ab408f0fabdbd46bb0e0c60594e55bec69b914bb26d1805a7174e1891c530dc63a7a8f04a4eb0d8
+EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 0ec8d4c4e195..05318d998ea3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
index 0ec8d4c4e195..05318d998ea3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
index e88a3ec3ab73..41322ff53b32 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
index 507876a36c16..2c95a68cb144 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -24,6 +24,8 @@ RDEPEND="${CDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-fix-the-nested-iteration.patch # bug #793410
+	"${FILESDIR}"/${PN}-1.2.5-fix-potential-null-pointer-from-strchr.patch # bug #793410
 	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
 )
 
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
new file mode 100644
index 000000000000..f06756a8af96
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
@@ -0,0 +1,49 @@
+From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001
+From: Chao Song <chao.song@linux.intel.com>
+Date: Mon, 31 May 2021 10:29:57 +0800
+Subject: [PATCH] topology: fix potential null pointer from strchr
+
+This patch adds check to the return pointer from strchr,
+because it may be null and cause segment fault, if component
+is not properly constructed.
+
+Fixes: https://github.com/alsa-project/alsa-utils/pull/91
+Signed-off-by: Chao Song <chao.song@linux.intel.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ topology/pre-process-dapm.c   | 5 +++++
+ topology/pre-process-object.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c
+index 450ca717..dbaf2f11 100644
+--- a/topology/pre-process-dapm.c
++++ b/topology/pre-process-dapm.c
+@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp,
+
+ 	/* get class name */
+ 	args = strchr(string, '.');
++	if (!args) {
++		SNDERR("Error getting class name for %s\n", string);
++		return -EINVAL;
++	}
++
+ 	class_name = calloc(1, strlen(string) - strlen(args) + 1);
+ 	if (!class_name)
+ 		return -ENOMEM;
+diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
+index 09aa3758..ac8caeca 100644
+--- a/topology/pre-process-object.c
++++ b/topology/pre-process-object.c
+@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp,
+ 	}
+
+ 	type = strchr(token_ref, '.');
++	if(!type) {
++		SNDERR("Error getting type for %s\n", token_ref);
++		return -EINVAL;
++	}
++
+ 	token = calloc(1, strlen(token_ref) - strlen(type) + 1);
+ 	if (!token)
+ 		return -ENOMEM;
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
new file mode 100644
index 000000000000..e175287a5598
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
@@ -0,0 +1,28 @@
+From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 1 Jun 2021 17:47:42 +0200
+Subject: [PATCH] alsactl: fix the nested iteration
+
+There may be nested iterations for hw: card names.
+Handle this card name in snd_card_iterator_sinit().
+
+BugLink: https://github.com/alsa-project/alsa-lib/issues/142
+Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops")
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ alsactl/utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/alsactl/utils.c b/alsactl/utils.c
+index c79fd951..881b5053 100644
+--- a/alsactl/utils.c
++++ b/alsactl/utils.c
+@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname
+ 	int cardno = -1;
+ 
+ 	if (cardname) {
++		if (strncmp(cardname, "hw:", 3) == 0)
++			cardname += 3;
+ 		cardno = snd_card_get_index(cardname);
+ 		if (cardno < 0) {
+ 			error("Cannot find soundcard '%s'...", cardname);
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index f7f5f47c1cb0..ca230d123c93 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1,5 +1,7 @@
 AUX sfxload.confd 165 BLAKE2B b183f16572379c928417dbc6037bce0739462def9cde600d1298677b4e55bddcf5df0407124c966519946c960847dcdeb1c44fe62e25192d361400df7fc4e959 SHA512 9725e28b10f512e6e8e3cf121f8d442b3f0148795e676760b434a02c9a4e19945915fd93d6fa012448f041d17819d32b38445a0946819e398647bfd5ce31c38e
 AUX sfxload.initd 398 BLAKE2B 90c2c51638531b7d51092b70af966db961889f0991a60ee8ffccfa36f73fb7e7df722e7914eb39c1a3c08b32b8da6cd1d58abfa8d3b0ba427a9748aefac7b801 SHA512 dd3522d112a0efefa1786ce37b9f9be3ee07eb50b0a618d7adb386ff007d9e9e907dcd9e184ed5122118723d702caeadc190018f0af5ad393c931eb0a549f31c
 DIST awesfx-0.5.1e.tar.bz2 307929 BLAKE2B a3bee0750ca44ab2e732f6bdb2c119104521330226e243be1b0ab9c19e2bfd87176ad2dc039f26b9552be621a7af2ef86852e2f31f8d0b9158b093712d2447e1 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d
+DIST awesfx-0.5.2.tar.gz 83611 BLAKE2B 7472f478bd1b228080a669d9df47b885d9953d363a06341cc2684af1723818a8938e31622aee9dd2ca6286c59db7715224c920e79cfa318cb3347b8833f67dc6 SHA512 f59f503c54de8bcccbd8a51c1f6a7afae98bd6b5ae4ad4ec467b4f29cece569b4f8e3185adf243816f786a0c2e92fe8d098d56f02d5704979ee8290ad61f46b6
 EBUILD awesfx-0.5.1e.ebuild 877 BLAKE2B 5df7bd23e316d5804fe6d3379ba57c152caed96399e726d004170b047ee31aacad5b7c2a92a8b344b5ff816d3faaa3980d066b53eb5165e696b7dfceaad885e2 SHA512 66b5a68571bca8dc4647684d5c07eea0d46ed298f2a796822b5d7eb6dd50e49a14ce0d382b3085cc74a3dc0c6c6ebd7ba01f77481cb3e8ad8e796c81abc588bb
+EBUILD awesfx-0.5.2.ebuild 947 BLAKE2B c05499e359e8beeb0d30891aa0a92d224388b4066dacd08a525b4ee9fd36ffdc5fc74b00a5349a7c5795dae6d587ef9d0c972d6354c8b74e5af6268813c800b5 SHA512 6b9224e125e17cb25bb19a6935fed2191c3ab4caf5cc11967a58ab5f4ce3fca9ff5e936628f240ea6c4af4396e582ef241ae98765915464a6ce0b4a2f4a58161
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/awesfx/awesfx-0.5.2.ebuild b/media-sound/awesfx/awesfx-0.5.2.ebuild
new file mode 100644
index 000000000000..3912ccf215bd
--- /dev/null
+++ b/media-sound/awesfx/awesfx-0.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="AWE32 Sound Driver Utility Programs"
+HOMEPAGE="https://github.com/tiwai/awesfx"
+SRC_URI="https://github.com/tiwai/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/alsa-lib"
+RDEPEND="${DEPEND}"
+
+BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
+
+DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-sfpath=${BANK_LOC}
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/sounds/sf2/README-bank || die
+	newinitd "${FILESDIR}"/sfxload.initd sfxload
+	newconfd "${FILESDIR}"/sfxload.confd sfxload
+}
+
+pkg_postinst() {
+	elog "Copy your SoundFont files from the original CDROM"
+	elog "shipped with your soundcard to ${BANK_LOC}."
+}
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index c4011bc1ddef..ab8771b7522f 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,7 +1,8 @@
 AUX 1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch 2123 BLAKE2B fea2eb593c8be68d3cd336a4bf56346c777ba651fdb98cfe6f9063a087428ce2749793ec61f109b2fea40dd8cc44ceb19b97d308c4c69c267b2993836b2b7ae6 SHA512 bf3ef299d66e7db79fcc0f7c4cd5abfbb041e6cea4bf06f02e498d3edf7495cd92f01191865af6a5bb40b064f0659d5cf80df7a42d14976e3e963ab94e113bdd
 AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4c3146b0e6fe343d4a437dfdb13aa60e0bbbf59f2959fee39f4d5bdb620fe57670e01a0963ad9eea3cf0309b3ea516e0931e9383c19 SHA512 2f6b5636ad3a16e70438fd2c1b62952416225dcc9acca686b1dc19ba4c2c5dbed4807f3f597e212d23ddf12de0fb0f315729da9ca86fbbc6766f4840dc83a524
 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
+AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r5.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955
+EBUILD beets-1.4.9-r6.ebuild 4532 BLAKE2B 4ade846a90fbe3438a86c7a0c4794e34bf231ccd4c2dd3ef3f0a8978edc6dae17fe23f8bde7bb7e1f738086f10b62b521f881c8ad2601c7c1703918e59d35323 SHA512 db10f1e25109ad3c953ae6d71db8db80733145dddafb782a3bb79bbb7c6c26fccb281dcf565ad131b69d2ef46721d113c0e08a48f37a4ca7aaee6c1a5fb4d99f
 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-r6.ebuild
index cc6a223082b5..4fd12ebc72c4 100644
--- a/media-sound/beets/beets-1.4.9-r5.ebuild
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -83,6 +83,7 @@ PATCHES=(
 	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
 	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
 	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
+	"${FILESDIR}/${PV}-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch"
 )
 
 DOCS=( README.rst docs/changelog.rst )
diff --git a/media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch b/media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch
new file mode 100644
index 000000000000..f7eb3d26b758
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch
@@ -0,0 +1,134 @@
+From 0da62a5ed7aa5fcfc8501a06f26c3af6afa8bc52 Mon Sep 17 00:00:00 2001
+From: George Rawlinson <george@rawlinson.net.nz>
+Date: Thu, 25 Feb 2021 20:00:34 +1300
+Subject: [PATCH] Fix #3608: Replace discogs-client with python3-discogs-client
+
+discogs-client has been deprecated since June 2020, the replacement
+is actively developed by the community and does not have any breaking
+API changes.
+
+Signed-off-by: George Rawlinson <george@rawlinson.net.nz>
+---
+ beetsplug/discogs.py     |  2 +-
+ docs/plugins/discogs.rst |  8 +++----
+ setup.py                 | 50 +++++++++++++++++++++++++++-------------
+ 4 files changed, 41 insertions(+), 21 deletions(-)
+
+diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py
+index 5a2bf57e..78d94eb1 100644
+--- a/beetsplug/discogs.py
++++ b/beetsplug/discogs.py
+@@ -14,7 +14,7 @@
+ # included in all copies or substantial portions of the Software.
+ 
+ """Adds Discogs album search support to the autotagger. Requires the
+-discogs-client library.
++python3-discogs-client library.
+ """
+ from __future__ import division, absolute_import, print_function
+ 
+ For plugin developers:
+ 
+diff --git a/docs/plugins/discogs.rst b/docs/plugins/discogs.rst
+index a02b3459..f8406fd2 100644
+--- a/docs/plugins/discogs.rst
++++ b/docs/plugins/discogs.rst
+@@ -10,9 +10,9 @@ Installation
+ ------------
+ 
+ To use the ``discogs`` plugin, first enable it in your configuration (see
+-:ref:`using-plugins`). Then, install the `discogs-client`_ library by typing::
++:ref:`using-plugins`). Then, install the `python3-discogs-client`_ library by typing::
+ 
+-    pip install discogs-client
++    pip install python3-discogs-client
+ 
+ You will also need to register for a `Discogs`_ account, and provide
+ authentication credentials via a personal access token or an OAuth2
+@@ -36,7 +36,7 @@ Authentication via Personal Access Token
+ 
+ As an alternative to OAuth, you can get a token from Discogs and add it to
+ your configuration.
+-To get a personal access token (called a "user token" in the `discogs-client`_
++To get a personal access token (called a "user token" in the `python3-discogs-client`_
+ documentation), login to `Discogs`_, and visit the
+ `Developer settings page
+ <https://www.discogs.com/settings/developers>`_. Press the ``Generate new
+@@ -57,4 +57,4 @@ Here are two things you can try:
+ * Make sure that your system clock is accurate. The Discogs servers can reject
+   your request if your clock is too out of sync.
+ 
+-.. _discogs-client: https://github.com/discogs/discogs_client
++.. _python3-discogs-client: https://github.com/joalla/discogs_client
+diff --git a/setup.py b/setup.py
+index 79278f8b..768c40a0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -107,30 +107,48 @@ setup(
+         ['colorama'] if (sys.platform == 'win32') else []
+     ),
+ 
+-    tests_require=[
+-        'beautifulsoup4',
+-        'flask',
+-        'mock',
+-        'pylast',
+-        'rarfile',
+-        'responses',
+-        'pyxdg',
+-        'python-mpd2',
+-        'discogs-client'
+-    ] + (
+-        # Tests for the thumbnails plugin need pathlib on Python 2 too.
+-        ['pathlib'] if (sys.version_info < (3, 4, 0)) else []
+-    ),
+-
+     # Plugin (optional) dependencies:
+     extras_require={
++        'test': [
++            'beautifulsoup4',
++            'coverage',
++            'flask',
++            'mock',
++            'pylast',
++            'pytest',
++            'python-mpd2',
++            'pyxdg',
++            'responses>=0.3.0',
++            'requests_oauthlib',
++            'reflink',
++        ] + (
++            # Tests for the thumbnails plugin need pathlib on Python 2 too.
++            ['pathlib'] if (sys.version_info < (3, 4, 0)) else []
++        ) + [
++            'rarfile<4' if sys.version_info < (3, 6, 0) else 'rarfile',
++        ] + [
++            'discogs-client' if (sys.version_info < (3, 0, 0))
++            else 'python3-discogs-client'
++        ],
++        'lint': [
++            'flake8',
++            'flake8-coding',
++            'flake8-docstrings',
++            'flake8-future-import',
++            'pep8-naming',
++        ],
++
++        # Plugin (optional) dependencies:
+         'absubmit': ['requests'],
+         'fetchart': ['requests', 'Pillow'],
+         'embedart': ['Pillow'],
+         'embyupdate': ['requests'],
+         'chroma': ['pyacoustid'],
+         'gmusic': ['gmusicapi'],
+-        'discogs': ['discogs-client>=2.2.1'],
++        'discogs': (
++            ['discogs-client' if (sys.version_info < (3, 0, 0))
++                else 'python3-discogs-client']
++        ),
+         'beatport': ['requests-oauthlib>=0.6.1'],
+         'kodiupdate': ['requests'],
+         'lastgenre': ['pylast'],
+-- 
+2.26.3
+
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 8847cfc699a9..4ad1c0b80bc6 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -2,6 +2,8 @@ AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fc
 AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0
+DIST bluez-alsa-3.1.0.tar.gz 179984 BLAKE2B b0bd5008d1bcc972577d8626970834934cc9424b4dff5c9ede1b1bfb0ac6c62c50dd8a7b94bdaa8884354379fb4fe06d758f620b2f42207d85f68da5064b3499 SHA512 8b2644cb2114569cc896869f22352386a9362eeacae823423a63d9b21198f561d4af796700fcd3267556bb69ff2575569474a1da8e3a645b5a2e779882c27cbf
 EBUILD bluez-alsa-3.0.0.ebuild 2413 BLAKE2B 1b79b12eaafb4edbc0ce2a1f90099f1f7ebf30e062d7d12b2a351d24a9681b56e8b17ef6e774d7121501f99374d678d1f0d33e971bf038a9a0f5ebecbb3f843d SHA512 76ce2586414a1fc995993600522fdc0183252e3f234bad6bf876ca94a772a622e3b8d32dde205322cb97aa063180c90d54344e3bbd2dcc6e8127468345470283
-EBUILD bluez-alsa-9999.ebuild 2529 BLAKE2B 4481a9048405bcfd3eaf197eceec9aeb31ccc64e0fbdf7db5478ce234ba19eb9da4fbfacb959b561628ef3db9bbc65e06066b0ea956a8b74a86780bef4938707 SHA512 7489fd50092bb3e3dc8a96d541629592af1f81cf17cfa24981430fa3ed5d5b95ae8e1ebe74f39d1e0b7d51be888cfd8e675562e9f3c8844ba6a8a6e7454a5675
+EBUILD bluez-alsa-3.1.0.ebuild 2616 BLAKE2B 30f218d9cf14067658438f0eeba4b354775e56d4f88f4b50a4f59000344559ad89233c4d0905aa05b04c5cb79cde9b85b4a5697b89e324df49393af055874f0c SHA512 f2d39dae3054c436299ae01a76abdd046f6540d5a78e85d866cb01ce4573f5b9440fa248de441cf0a3ca63ac11a7398d8964e3fb63facdb4e6522cae2353e1d4
+EBUILD bluez-alsa-9999.ebuild 2616 BLAKE2B 30f218d9cf14067658438f0eeba4b354775e56d4f88f4b50a4f59000344559ad89233c4d0905aa05b04c5cb79cde9b85b4a5697b89e324df49393af055874f0c SHA512 f2d39dae3054c436299ae01a76abdd046f6540d5a78e85d866cb01ce4573f5b9440fa248de441cf0a3ca63ac11a7398d8964e3fb63facdb4e6522cae2353e1d4
 MISC metadata.xml 778 BLAKE2B 3dada8fbc2d9ff4fcb093d437be17f1cae5e575a15ef65fb275e74459e72b4942fa5603c112ae15ceb7fc51f92c0961622cb00e64bc53e2ab8ef8b99a923614b SHA512 1b4913a7310386d7c01c54ba1d5baed8f392324759d6e58eb93084dc17903622d0dfaa247ff795a03fc91cfc0e6e438d51692a35272de6a882082b47fc8f5e61
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
new file mode 100644
index 000000000000..80ea97b69dbe
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 multilib-minimal systemd
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
+RESTRICT="!test? ( test )"
+
+# bluez-alsa does not directly link to upower but
+# is using the upower interface via dbus calls.
+RDEPEND="
+	>=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
+	aptx? ( media-libs/libopenaptx )
+	lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
+	mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	ofono? ( net-misc/ofono )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	upower? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/pandoc )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-cli
+		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable lame mp3lame)
+		$(use_enable man manpages)
+		$(use_enable mpg123)
+		$(use_enable static-libs static)
+		$(use_enable test)
+		$(multilib_native_use_enable aptx)
+		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable ofono)
+		$(multilib_native_use_enable upower)
+		$(multilib_native_use_with aptx libopenaptx)
+		$(use_with unwind libunwind)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+	systemd_dounit "${FILESDIR}"/bluealsa.service
+
+	# Add config file to alsa datadir as well to preserve changes in /etc
+	insinto "/usr/share/alsa/alsa.conf.d/"
+	doins "src/asound/20-bluealsa.conf"
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 86a703524a0e..80ea97b69dbe 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal systemd
+inherit autotools bash-completion-r1 multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
 else
 	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -56,7 +56,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--enable-cli
 		--enable-rfcomm
+		--with-bash-completion="$(get_bashcompdir)"
 		$(use_enable aac)
 		$(use_enable debug)
 		$(use_enable lame mp3lame)
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index e31cb5bf097e..d23240331274 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,6 +1,6 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
-EBUILD cadence-0.9.1.ebuild 2415 BLAKE2B 12dabbd1b604defe7916c62df4064a71be89a9f80b0222026d1a29645a294a69e790bfc3ca87a829806dc0b43ac47fe6e2821ecea9b6ccb861db00cd30546532 SHA512 a55964b78752c56b49502210e7faf4b8415ce7ab1388295356b2ec5e56adcf4f96a1e102c118c88ab6a618c9eef689cf46e3bb39b48eb439e84a63531d341b59
-EBUILD cadence-9999.ebuild 2386 BLAKE2B e4a06c60b01d4c92997eefae89159e2d76b9a07a92b1047bbdba87c27a59078c7739a9d3fb19e611a70df287453acb97f50612e85b6446d96b05432979215864 SHA512 f0073bc05fd2ab1e3bcc7111b86dc73d10f88a79695da8454f03ddabb7341985caaed50e1a88061d896b715cdfe1f14e136b6636a18dc8f81313e281962a3341
+EBUILD cadence-0.9.1.ebuild 2414 BLAKE2B 32dff6e89a16624af031a3b42ce21b4bc9d8e75747a4c68427b2f2689841a7694d81546ec101cd33accbf3b0fdd0d72b27e3e408d23f1770d83c0dc10bc201f0 SHA512 514fea7a00b8371b10c106121961818f9e8cbbba80be602f1eeedb01c513f897331adf9cd6cf8e0e3b83e29bc69b4674c050d43f425f61ec75a6fdf5968bac5f
+EBUILD cadence-9999.ebuild 2385 BLAKE2B 97e0c262182d80e2bb66039d53ffa7544a29627a17ebc2ef5662188b63ac02a50d2840fbbbc3d1a987456fab837a962fc6edc5bc317a308dfcad5f85f618df24 SHA512 9c66e750c5bc3386c8a60919cca0e6da2ac992c04d12b6565d9952e2825857a6fe344739a943fcbffa76aa4dadf8f93282dbe8910df2474020513d4d40586240
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 026f01179e6d..7ce406e271d8 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="a2jmidid -pulseaudio opengl"
+IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index d99be6470613..8aa575803de1 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="a2jmidid -pulseaudio opengl"
+IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 2edf8a5204bf..2871b3fba369 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -4,7 +4,11 @@ AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153c
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
 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 Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb SHA512 e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
+DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
+DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578 SHA512 243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
 EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
-EBUILD csound-9999.ebuild 7114 BLAKE2B 881fa5a0828fe1374c706f0a1cbdc02f711512e009c4628a171a5630bd50f2e1a49db924034d7b5a607ecda027417790a9e881b1b62d14f7b1392779c0530a60 SHA512 f02323ac78b0a30a7a0e6048036085ee5a1dfb97b4cc70c99507e55197917c43ffb0367ccd52922eb286b629acda342e499ec5f0a874b5dcb4f1234d17bedae4
+EBUILD csound-6.16.0.ebuild 7123 BLAKE2B 207820801b2d07d69253ad9113ca973ecfac3b70a5674697888178aaadab541553b2f9d87546e4141c17c8b8fcc53fde977e3cfea758c6a9523a4bcd8155af84 SHA512 6eb96c1b9be8e48846560dc368aa5305134ff447ed49413a04a878c70d310070cfee7dbec91471a1c17697126d214fc0cdb63d80297476a3304cf9c3f615f9b8
+EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.16.0.ebuild b/media-sound/csound/csound-6.16.0.ebuild
new file mode 100644
index 000000000000..27e5f4a83d43
--- /dev/null
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -0,0 +1,262 @@
+# 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"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 jack java 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 )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} 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
+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 )
+	jack? ( virtual/jack )
+	java? ( >=virtual/jdk-1.8:* )
+	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
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+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_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-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_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_HOME="$(java-config -g JAVA_HOME)"
+	)
+
+	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.
+	)
+
+	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
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index f0b572659996..f997f81d6444 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="https://csound.github.io/"
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
 vim-syntax websocket"
 
@@ -71,7 +71,6 @@ CDEPEND="
 	fluidsynth? ( media-sound/fluidsynth:= )
 	fltk? ( x11-libs/fltk:1[threads?] )
 	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
 	jack? ( virtual/jack )
 	java? ( >=virtual/jdk-1.8:* )
 	keyboard? ( x11-libs/fltk:1[threads?] )
@@ -133,11 +132,9 @@ src_configure() {
 		-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=$(usex java)
@@ -152,7 +149,6 @@ src_configure() {
 		-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
@@ -204,10 +200,6 @@ src_configure() {
 		# so it must NOT be installed into cmod_dir.
 	)
 
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
 	cmake_src_configure
 }
 
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 0508f1ba3aa5..07c080b60d89 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,6 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
-DIST din-50.1.tar.gz 3684686 BLAKE2B 3d73f31f91a57188b63f1f5fc9a68923c4fb6d9a14cbfd602510d0006ff4079ab60865e49118a02e46381aebd4cc4ee9415172bac724f8491655326147b6466b SHA512 c860c70bb9f3c3db66e05dd9f9048daecab1b0c9d0588fde901ce26723e291b56d23086f792180fb5fc688165e4ed7efdc302d0d3d02efa913be5f2d4a90f5eb
+AUX din-50.2-gcc11-rename-identifier.patch 1207 BLAKE2B 336f06a9e4baf9e7dcb44c86c40adef61caa2ea231d695e59720e600d2fba9c7f788be63c18b135ebefcfda879ea067b633066c80a7f9b8bb501c0c31bbbe16f SHA512 2496ac4026b70f0c3b00adcf3b295ddb77c25e10f436b0222432536f0a5d3efd1d5a8df4d5ba15643c7c29323e2d25dcd197649815e90c11e19fb28dd6a8eedc
 DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
-EBUILD din-50.1.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
-EBUILD din-50.2.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
+EBUILD din-50.2.ebuild 1145 BLAKE2B ad96be1ff43ee274ffc8d7605024888952ea6f2cdf9dc8c11dd27b6192d065bf7e4e66cfeff4abdcc2514934ebe55795a33f185f59c81f147e95540a21edba8e SHA512 1050c39d47fbf190f35f410220a5c38f637c32d7bda5fd33efb896df8fc2ee2348a52f084b3f8261b912a7869008fb1a13fb0f901d9c9f13e26ba3baf285f34e
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-50.1.ebuild b/media-sound/din/din-50.1.ebuild
deleted file mode 100644
index f2a1cb085d4b..000000000000
--- a/media-sound/din/din-50.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-49.1-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/din/din-50.2.ebuild b/media-sound/din/din-50.2.ebuild
index 4d68ab765afb..31e46f323352 100644
--- a/media-sound/din/din-50.2.ebuild
+++ b/media-sound/din/din-50.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
@@ -35,6 +35,7 @@ REQUIRED_USE="|| ( alsa jack )"
 PATCHES=(
 	"${FILESDIR}/${PN}-49.1-makefile.patch"
 	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+	"${FILESDIR}/${PN}-50.2-gcc11-rename-identifier.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch b/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch
new file mode 100644
index 000000000000..8245a5cb021b
--- /dev/null
+++ b/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/787185
+
+From 9ea918cfdfcd99fbcac64a820ddbaefb562c11a0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 14 Jun 2021 15:06:58 +0000
+Subject: [PATCH] src/help.h: Rename __help identifier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+__help is reserved, so we need to rename it to fix a build failure with GCC 11:
+
+	"In addition to the names documented in this manual, reserved names include all
+	external identifiers (global functions and variables) that begin with an
+	underscore (‘_’) and all identifiers regardless of use that begin with either
+	two underscores or an underscore followed by a capital letter are reserved names."
+	-- glibc manual, 1.3.3 Reserved Names
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/help.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/help.h b/src/help.h
+index ae0954b..af7f178 100644
+--- a/src/help.h
++++ b/src/help.h
+@@ -5,8 +5,8 @@
+ * For more information, please visit https://dinisnoise.org/
+ */
+ 
+-#ifndef __help
+-#define __help
++#ifndef DIN_help
++#define DIN_help
+ #include <string>
+ #include <vector>
+ struct help {
+-- 
+2.32.0
+
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 8066cab0e305..9c2b64c5abea 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +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
+DIST drumstick-2.2.1.tar.gz 1976813 BLAKE2B ac27fbcfb92fff2b7d69c70f9ec677343e8d66164997a29f319fbe94e6d12582cb4af67f0ff36126a6102e48bcbe4d4620e9442fdecf07aaaeecf37e9458c590 SHA512 d99c774f33db9d8555efd83adc8968d6d244e56e7976d68f0f90ff89cfda1143b2e07eece6b465fffba354073d4616c5a767f09f2ba282e252ca0955723cadc7
+EBUILD drumstick-2.2.0.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
+EBUILD drumstick-2.2.1.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
index 1459d1b265ae..dd7730300b59 100644
--- a/media-sound/drumstick/drumstick-2.2.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/drumstick/drumstick-2.1.1.ebuild b/media-sound/drumstick/drumstick-2.2.1.ebuild
index dd7730300b59..1459d1b265ae 100644
--- a/media-sound/drumstick/drumstick-2.1.1.ebuild
+++ b/media-sound/drumstick/drumstick-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index f4b0770298d2..ec022d0b628a 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.1.tar.xz 1721592 BLAKE2B 35ccd0144b4aed2f143a901e004b0e1fab025db2abf6fffc76475a8cec95b475b5d9a291a4567dfe38148681e64986eb7c37d3d7e21d3ffea1b1a88b6e3b8ee3 SHA512 d9c042e2ed0458c35ca07e5613a09aeac7b9fe1c89e5312f7f623805e526b2d34cf54b62ed1563d188c87b2679c42a1791feb12f7e83264253e5dfd5c3e4975c
+DIST elisa-21.04.2.tar.xz 1724456 BLAKE2B f2c78a98168131bf6b6bc3a085ed43d6c65dcd3801c9dd5f4001906fa18441cddab098b73a1b056265854b951f9a4cbd8c1386f9fd1b5c7844e90a3493e39ff5 SHA512 69c9f605c1c15bf5d8a076f9851fee99655bff78a5da628c0b767f63ef5efd36df53112cdc523fe988afb56f62786b5f8c670a3c996b7827e8f6df58b76274d6
 EBUILD elisa-20.12.3.ebuild 1658 BLAKE2B 4351d92ef0d8902ff9ff6435161f79580327b31a21add05d8a90978a4724e8bc5d6e6720772f46f14c0f0fdb6076ae9f2d86f23e1a21327dd7617481e2ecac52 SHA512 2ff5520e1c11115a4ccdecfbacadefdae94be53155f742e03c579ce1a9daaafc34ac22dd8a898183403788250e9076debdbba82defbdb9a2d69475352a002979
-EBUILD elisa-21.04.1.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
+EBUILD elisa-21.04.2.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-21.04.1.ebuild b/media-sound/elisa/elisa-21.04.2.ebuild
index b7ac1e0751d2..b7ac1e0751d2 100644
--- a/media-sound/elisa/elisa-21.04.1.ebuild
+++ b/media-sound/elisa/elisa-21.04.2.ebuild
diff --git a/media-sound/entagged-tageditor/Manifest b/media-sound/entagged-tageditor/Manifest
deleted file mode 100644
index 935ab15dd6e0..000000000000
--- a/media-sound/entagged-tageditor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX entagged-tageditor-0.35-buildfixes.patch 1859 BLAKE2B de254c5d617c074ade950b37b14c9ec49c92f2d22efdf6ccd2d4d156911c4e77220ed0297e5e4f0c6997e62172b5fbc706a567837fafc8d63638e302ee349c35 SHA512 544c91b207744a55320935af689c0987f5798ea931b7bb498dd1b2028defa690bdeb1419de2701ce3a2d35f91b2943f0818dbc63c36581d7019b53c6493a8406
-DIST entagged-tageditor-0.35.tar.gz 4606721 BLAKE2B c7013ed9bbef046bc46897f59e6bf668f835dd80ece83d19ef9ea83f089461cb677cd55a98554310734c36bb97945db7db13eb00cd7ae06e82c0f3ea00e928ae SHA512 cefebce7381d489ccd821933c3a1d330713d4de6cf9366aa699f5017939620589c95a2ee162aabc7bfa6d42d56b5986f4ecaa2f1f77ec586cda5f6780f0a06f3
-EBUILD entagged-tageditor-0.35.ebuild 1132 BLAKE2B 59bd583b7eab1724a6c4c777abe57cfb5b3187e8bad93ddd6db89c64e3fd57bee8c2182514b2e7ba3d73555591d958e6729aacf2755ee5bd57cbd6817f97aab0 SHA512 fbceb85a877ead1b15290b19e63951b44074cb7aa8d37c2ac3cdee81eacbabdaea4033f6ecbfb752602d831b214cf83cf17fa576d8f3aa394c58dc04537d6d0c
-MISC metadata.xml 294 BLAKE2B 9f0e6935f2296bed9ad96d9a3c14c1b8fc04785c660279184c86b1f05f411e1f8c77ce267d628fbf33d19e69123d6e1e1007ec7fd87a087a5e8c8945adead4b7 SHA512 d9ab3a99fc847b029f4c1ac9ab321b066de58a68c2e5841147b6a4a25a940c8629f0dd4acb06a057acafc7420009fbd4b3843ed82ce85ece6e32b21aad24690e
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
deleted file mode 100644
index 1113fa708d1e..000000000000
--- a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 java-ant-2
-
-DESCRIPTION="Open-source audiofile tagger"
-HOMEPAGE="http://entagged.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/squareness-jlf:0
-	dev-db/hsqldb:0"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-db/hsqldb:0"
-
-EANT_BUILD_XML="entagged/build.xml"
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p test/entagged/junit || die
-	mv entagged/entagged/junit test/entagged || die
-	rm entagged/*.jar || die
-	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
-	cd entagged || die
-	eapply "${FILESDIR}"/${P}-buildfixes.patch
-}
-
-src_install() {
-	cd entagged || die
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	java-pkg_register-dependency squareness-jlf
-	java-pkg_dolauncher ${PN} --main entagged.tageditor.TagEditorFrameSplash
-	newicon entagged/tageditor/resources/icons/entagged-icon.png ${PN}.png
-	make_desktop_entry ${PN} "Entagged Tag Editor" ${PN}
-}
diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
deleted file mode 100644
index 709b16b32a58..000000000000
--- a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build.xml	2007-03-23 16:25:25.000000000 +0200
-+++ b/build.xml	2007-09-01 09:20:44.000000000 +0300
-@@ -30,7 +30,7 @@
- 	<property name="entagged_dir" location="."/>
- 	<property name="entagged_base_dir" location=".."/>
- 	<property name="tageditor_dir" location="tageditor"/>
--	<property name="tageditor_version" value="0.21"/>
-+	<property name="tageditor_version" value="0.35"/>
- 	<property name="tageditor_jar" value="entagged-tageditor-${tageditor_version}.jar"/>
- 	<property name="tageditor_zip" value="entagged-tageditor-${tageditor_version}.zip"/>
- 	<property name="tageditor_tar" value="entagged-tageditor-${tageditor_version}.tar"/>
-@@ -52,7 +52,7 @@
- 	
- 	<!-- Compile the sources -->
-     <target name="compile" depends="clean">
--		<javac srcdir="${entagged_dir}" classpath="${entagged_base_dir}" excludes="entagged/junit/*" source="1.4"/>
-+		<javac srcdir="${entagged_dir}" classpath="hsqldb.jar" excludes="entagged/junit/*"/>
- <echo>
- Entagged Tag editor is now fully compiled.
- You can use either:
-@@ -71,9 +71,8 @@
- 	<!-- Prepares the classes to be packaged -->
- 	<target name="build" depends="compile">
- 		<!-- Jar the classes files  -->
--		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/*" excludes="**/*.java" >
-+		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}/entagged" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/* miage/**/*.class" excludes="**/*.java" >
- 			<manifest>
--				<attribute name="Class-Path" value="${tageditor_jar_classpath}"/>
- 				<attribute name="Main-Class" value="${tageditor_jar_mainclass}"/>
- 			</manifest>
- 		</jar>
diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
deleted file mode 100644
index 4d2b70e37efa..000000000000
--- a/media-sound/entagged-tageditor/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">entagged</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index e5f4806f2348..df0247f1dfd6 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,5 @@
 AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
 EBUILD exaile-4.1.1.ebuild 1745 BLAKE2B 1208834f32ceebabba8a497a7a0a1d830ede5905c58c73bf65bedc49665fc2c89196f46da8b8cc1963a428694763ce970744f083947819ca26ab304ee32b0251 SHA512 9413433a313b67ff2240d0539c16172b211c0ef5b567259dc9a54df39fac15cf8981e557e9fcba24e2bd5deaacd05f9c77ca74c3eb5b7242c20481e46bd2527f
-EBUILD exaile-9999.ebuild 1759 BLAKE2B 791c8d8958a0651b7da7f218443b770d30b0add13016bd9b1653970fd33b261897e4d3469f6eebeeb970828947023777a5129842e51c1951d328ef7e74f3fd90 SHA512 f8fe43cf78175bf9d36269a9582f0c2dd6afaafabcc79e8ce14f611b701e3f8c9d20b982be0e54db91f2ced777802c5ee7f312bed2ff5bdfd64671bc47ffbabf
+EBUILD exaile-9999.ebuild 1752 BLAKE2B 49f121420c3cbe72fbc917f58f16c6156862a58e865dfe8571c826eff0cd67977f5e2d5fc31db7d9ac4e3da90b5405253dbf52ad4b38f52c34f48f47d1111deb SHA512 253ade14a8f5581a6700fe27d7a9ce1a0c5d16dd9433d084411a25ef48440b4a7fc0d26d11b059af0a6bd2a8e05989d39a96ca409fc0578ab27da3a2b9116f86
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
index 270bd3209261..566fd8c3d201 100644
--- a/media-sound/exaile/exaile-9999.ebuild
+++ b/media-sound/exaile/exaile-9999.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${PYTHON_DEPS}
 RESTRICT="test" #315589
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0_alpha1-metainfo.patch"
+	"${FILESDIR}/${PN}-4.1.1-metainfo.patch"
 )
 
 pkg_setup() {
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index a224bae8acbf..f27a23d412a9 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,6 +1,4 @@
-DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
 DIST gigedit-1.2.0.tar.bz2 1174502 BLAKE2B 049e4c60b345c192255669a71588df1e2905590f95351d8a79134b210d03087ac9cc33f12cbf2e38208b95ad452f299c78877632989cd914d98a05c5967087d5 SHA512 b991a5193af34be70db6eb8c18fc58e01b822b6997bfc6c3ee06eca42f57375d341316e8abc594824668c7cb916b0643a1ee1b5c34426bf3ec5e202dfc565c8f
-EBUILD gigedit-1.1.1-r1.ebuild 965 BLAKE2B e1426f55ad36985ae38131dc1db9936e96b8736808e9fb1a3ebf54e8ce05a09e624c7faf998442307e7d949f24afdec6848bf1dcc08f332feda94d7eedbf3239 SHA512 65b7981f73005785ae58383c83162f4f21e301f194d90d3bb488db4ab1ff86ed29bf85586418149df20555509df9764ad000e83d2777723a1eebca14f3639432
-EBUILD gigedit-1.2.0.ebuild 1026 BLAKE2B 497454e945acca12e7c65615d6e6b93d2473b7a6ea8010e5a835ccb4e422901c69f95396300ae50c92d36b45a2033acc877cf43a64942a0e3fd0396eb4a2e532 SHA512 e9aa456753499df0363eba63b016667b2922041297eb98f39137788d82880d13bacccb54fca1546d597f423e1561fdd818d82e1468f792f3e6b4ed6df8430f7d
-EBUILD gigedit-9999.ebuild 1012 BLAKE2B fec2f13b93378b6f01f76e8ffdb2c66cc94b8e5b5a489d17da5bff57dc1816e07bcdb152944ae200f6677027d95d569f62d4928befcdf9fa9f2e6d70cf10cd45 SHA512 820026ae8c6914b7ea4eb90354c87e707027fc61e0fedcaafc3410a747149ccc636289b49ea48de37c674cfbb204b4d4e8eede2a286b2fcb72b98197c6e09bc0
+EBUILD gigedit-1.2.0-r1.ebuild 1025 BLAKE2B 22cca2f1656e37e4ec48f6041d5d8d351a89c0faeec0aeb67d5de45b109e82fd6b74d7551e3a1d15b589a42f728e269d62cf091374d30619ad7f51faf035abf8 SHA512 4152161ec8cddaf658ddc0129f566258fc9cf43dd0ee69f56b2acf119baffff702e0bec6fcad45ff47781db0e6e471ac933f6aa42bb85d801e54c2813ca11941
+EBUILD gigedit-9999.ebuild 1012 BLAKE2B d280f99df86bcd86012efd594f37fe21d1ac6f96ac98249dc56bb13c7be4774dc5079e2378abf7feae7538f301ed12c14ff6a1a35142ae0176649259e79f1ad0 SHA512 3f0b10c8393a9ca94ae3c6a7aee4465d51562ef35a0b26be06c7c511e6aaba85b4d637d1e4f5faebff595926fe046080cdbb460fa45d896c244b2e8e0b11cf7a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
deleted file mode 100644
index 8c8ab2c48999..000000000000
--- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic xdg
-
-DESCRIPTION="An instrument editor for gig files"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.3.0
-	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	# docdir is not propagated there
-	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
-	econf --disable-static
-}
-
-src_install() {
-	default
-	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/gigedit/gigedit-1.2.0.ebuild b/media-sound/gigedit/gigedit-1.2.0-r1.ebuild
index 4d2a0ef9057a..fe1b62b19a5c 100644
--- a/media-sound/gigedit/gigedit-1.2.0.ebuild
+++ b/media-sound/gigedit/gigedit-1.2.0-r1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
-	dev-cpp/gtkmm:2.4
+	dev-cpp/gtkmm:3.0
 	media-libs/libgig
 	media-libs/libsndfile
 	media-sound/linuxsampler"
diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild
index aaef3a74634e..624397569412 100644
--- a/media-sound/gigedit/gigedit-9999.ebuild
+++ b/media-sound/gigedit/gigedit-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 RDEPEND="
-	dev-cpp/gtkmm:2.4
+	dev-cpp/gtkmm:3.0
 	media-libs/libgig
 	media-libs/libsndfile
 	media-sound/linuxsampler"
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 77376906bab6..2fbfdd37eba7 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
-EBUILD gnome-music-40.0.ebuild 1922 BLAKE2B cb18d9568e0fb13bceecff8b94618c268f9afd415ab3e9a7a89d4c91888673b6e559ad7f078f4aee1fd00d18526e30d9c6cb2d26da022c72f3d27e2ec1ebb483 SHA512 9b12ea406f65353ad45eb719999fad8b45ff79fee26dff65b5cfd3e07b082fb138e845b1f0f90c64be18be3ad914f33e73cff0f94a18280bcbd3d2816359dafb
+DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
+EBUILD gnome-music-40.0.ebuild 1929 BLAKE2B a86a4506fc9ab52e31b19183ab6d8a102709dfe0c49474924b485990b2228fffa8c6c61faafee8b361bafd8cc09e70bff5d4799f1b532ccef34dffb0c14b640c SHA512 4ac8aea4cd09634a181429376b3f490dc9aa53caa52bb788de36225dd51da22f91b7bb18a02f17eec53cfdd61bd33c15f8fa50c7fb5b297b9fcd305480812621
+EBUILD gnome-music-40.1.1.ebuild 1931 BLAKE2B 3a6267377f2da33f46cff9ae41dee258e8cf5f05bbeaf7b0c6846b6f430822e10ed038b0e6871f331a95764be992592c794ba24474d28c71b79a82165f06fd23 SHA512 44d692f3accbecbc0f55ea6fb700eab6696254ab1971479776c387c15ee00a42ce585a9ffe241dee08170d38cf9641576cbb75639434515416d323bfc3a7b699
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index b9e291603ed2..21901b881186 100644
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
new file mode 100644
index 000000000000..e4f1fbfad036
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	>=net-libs/gnome-online-accounts-3.35.90[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.24.7:3[introspection]
+	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	app-misc/tracker:3=[introspection(+)]
+	>=x11-libs/pango-1.44:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.13:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.13:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		app-misc/tracker-miners:3[gstreamer]
+		app-misc/tracker-miners:3[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 6d94be126b3a..2779c73f8e1b 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,3 +1,5 @@
 DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
+DIST gpodder-3.10.20.tar.gz 1081171 BLAKE2B b2a07a3d5ce02cc46d7dd5999287b6e0bb96149f2fbf613b0d70b8d3b04d4cd29dcd1b78b4584709d1613c9a5478d39c3cb9be35a274358d56aa593f0196e6b2 SHA512 93cae9cc6d7f3a7754e24f7e962d195788f5f344992a4a3f3be9fd9acf419728b94ce009e1a2e14faa64803ebba098e8199a8d43ed33f5f3e02eabde1fe5c3be
 EBUILD gpodder-3.10.16-r1.ebuild 1673 BLAKE2B 50032f1e8587327b1916e131695104702010320c970bac1b824941108b910cdf626fe64773b9b7dcb1c984abf9a7742c40607d3e1343e7558a0aa0a79b15e119 SHA512 344124d54a1bb16fc0ca739777b976d3b108426a4409c205d8ad7497fbfe3a22bc809adb679b74ab162477b921157c43f46b028e3877d9e8c28bd1b9e810adaa
-MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
+EBUILD gpodder-3.10.20.ebuild 1722 BLAKE2B fc678f400a9e269e599089565680e1243da2e97a7996c2beff8d1299a98d419e7f57dc8dacb8d804d6c69678e623dfcd607dc75073f9096cb17f629601ff0fa1 SHA512 6f7f5041b98017208ae43a4c343bfed5a18cf85bac148959bbd7c88b7936eada6cb6c9868eaf2feec76acd034e2ce73dace83e4eb5d5d455f300e21643d292d8
+MISC metadata.xml 357 BLAKE2B e9cb306227c9b0dd894c9c2a54db89c56f343bf5e38c87cf9c5e6843a036e18b123cd0079feed2924ad5c561214d6767c2d6474852cb396e543d6d3a604dfb7e SHA512 29feefe6f7c9d11cb06c3b960e19f48b5b33ff1f3a2b58060e6171d9aa2ec0fea49ba23af47e9c2cbc52c2440628af3e735b1e976af3fef957c194589159dee7
diff --git a/media-sound/gpodder/gpodder-3.10.20.ebuild b/media-sound/gpodder/gpodder-3.10.20.ebuild
new file mode 100644
index 000000000000..3be14aeb7ee0
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.20.ebuild
@@ -0,0 +1,71 @@
+# 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="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/pytest-localserver
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+src_test() {
+	emake releasetest
+}
+
+src_install() {
+	emake PYTHON=${EPYTHON} DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "for the youtube-dl extension" net-misc/youtube-dl
+}
diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
index 39626a990be5..09aa57ae4e71 100644
--- a/media-sound/gpodder/metadata.xml
+++ b/media-sound/gpodder/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">gpodder/gpodder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
deleted file mode 100644
index 566220231523..000000000000
--- a/media-sound/gramofile/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gramofile-1.6_p9-gentoo.patch 1100 BLAKE2B 69842cf58285f4621c04b6bc290f28aa79a056edac8f0870d166ea47a7c8fedc84a154493bd6470eaad1c474d875688f1b2723e100e0dead97fc4c09ff813865 SHA512 bd385cf856c6463e0e04a61b0e02bc2b15fced806fa9fed6612451da99823d526dba3f077c773c14cc0b860301ba56b7a8903c5df12c6ed23b31014b60c8ee3e
-AUX gramofile-1.6_p9-strlen_and_exit.patch 392 BLAKE2B a42c5dedc28f607c77c308154cf61e5012309904862a34c20efc91b2748e3cffd6585a9c1c75a0da68683e80444ad144a17cfe9b2617b24c3c448d54b0de775c SHA512 266dcbce4654c31e120d97e30e56764bac9f44dd412015c602bd43d902c38eb9fd9aa47dd7fe64961a1ea28eee1bcc992ec1d83a024cb1482a2b8d9e70c55034
-DIST gramofile_1.6-9.diff.gz 25244 BLAKE2B 60170f960693932d894022d0c576b2d58764e546e6f2a13461ab78abfb92235007047bb9f35964859908c580c815d21e8c80d73ddd4e33b0c1d25deda78d395a SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249
-DIST gramofile_1.6.orig.tar.gz 108596 BLAKE2B fc076c60d3f2f46ab33f63194db165b6d0df6bd76996bade730968dfd821d234b0a88f486e98f84e76804efb8b08fb2538cb553de5f9eb09eb3dde60b441fbf4 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
-EBUILD gramofile-1.6_p9.ebuild 963 BLAKE2B ad6352f2fc156402468501f33242978fb3052436cc36bd7bed9ebb06152ebefe6f9c162b8bc16db52ef26dba539adcd153d53d37c27b39ccd9752810498a351f SHA512 276013b3a84dd13accf15adb55400e71ca23f986e31a228b62b47fa3f978fd866ee5b202ae1b4c89691552ac6c492e3b564783a8066f3cf430efa3c88e282ee3
-MISC metadata.xml 871 BLAKE2B 19a80d0e429503c3b745ec38782480b79631e083c51e676e831ffebcf38ad342013e3cafec545dbe05f830e1267db85634f5c6c83fb6188fe1666e4a9d7d97c9 SHA512 12ff2b2a524bb2e9b3d54c4a1cb4f1739f4ff5a664a01074a1759cf34593e110ddd80f5128a2d2ed222e20f80e329cd3af231ec726665c23bc36cd25cd384b22
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
deleted file mode 100644
index 9fdbe1477233..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -14,15 +14,12 @@
- OBJS = $(SRCS:.c=.o)
- SHELL = /bin/sh
- 
--CC = gcc
--LDFLAGS = 
--
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
-+CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
- DEPS = $(OBJS) makebplay
--LIBS = -lncurses -lrfftw -lfftw -lm
-+LIBS = $(shell ${PKG_CONFIG} --libs ncurses) -lrfftw -lfftw -lm
- COPY_A = -a
- 
- # For FreeBSD (and maybe others), use these:
---- a/bplaysrc/Makefile
-+++ b/bplaysrc/Makefile
-@@ -6,14 +6,11 @@
-         ../clrscr.o ../secshms.o
- #SRCS = bplay.c sndfunc.o shmbuf.c
- 
--CC = gcc
--LDFLAGS = 
--
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
--LIBS = -lncurses
-+CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
-+LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
- 
- # For FreeBSD (and maybe others), use these:
- #CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
deleted file mode 100644
index 0369914779fd..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gramofile.c
-+++ b/gramofile.c
-@@ -11,6 +11,7 @@
- #include "splashscr.h"
- #include <signal.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
---- a/signpr_cmf3.c
-+++ b/signpr_cmf3.c
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
deleted file mode 100644
index c0697de57da2..000000000000
--- a/media-sound/gramofile/gramofile-1.6_p9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Transfer sound from gramophone records to CD"
-HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
-SRC_URI="
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	sci-libs/fftw:2.1"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P/_p*}"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
-	"${S}"/debian/patches
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-strlen_and_exit.patch
-)
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	dobin gramofile
-
-	exeinto /usr/$(get_libdir)/gramofile
-	doexe bplay_gramo brec_gramo
-
-	dodoc ChangeLog README TODO *.txt
-	newdoc debian/changelog ChangeLog.debian
-}
diff --git a/media-sound/gramofile/metadata.xml b/media-sound/gramofile/metadata.xml
deleted file mode 100644
index 5b2e2819c938..000000000000
--- a/media-sound/gramofile/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<longdescription lang="en">
-GramoFile is intended primarily for transferring gramophone records to CDs, but
-has many other possible uses. It can record very long .wav files with a bargraph
-signal peak-level meter, playback any part of the files, split long .wav files
-into separate tracks (with automatic track location), and process the signal
-with filters to reduce ticks and pops (multiple filters are provided, they can
-be applied in any order (multiple instances) with user-adjustable parameters).
-Track splitting and signal processing are done in the same run, and don't need
-any temporary files.
-</longdescription>
-</pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 61167867c5e7..488b5093bf34 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,9 +1,7 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9cfbf60defe7c3fdcac0f3e943c54dfc38e152df3beb71c5453c7e1df126a3415aa9ea9d75b2abba80efbbf65e64b10388f195c4 SHA512 4d7204b567e578efb3370e11ae69c631c49b01e864c7fb59d6eed309c7ff9ad9d2aa7832ef233f4c5b8e6a26af06c2d9d239cb361d69966e2556cb2816415de2
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
-DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
 DIST linuxsampler-2.2.0.tar.bz2 1507276 BLAKE2B 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a SHA512 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68
-EBUILD linuxsampler-2.1.1.ebuild 1771 BLAKE2B cc80a074fe0207af14bf0ff376ca725905489182eb7b66303548e9bc6aa84cde640777c20e69ef1032305693a39da3efb7f0e21977d5b48d77edbcfdde37f8a1 SHA512 5f94e326e83d9c9adf20d70d893262c44aeb2c0f9b178027348f053bcd6f7ddcbbce613db48e35d3b53582b81e1f5bbe410167746ccdeef817e5cc96411d7843
-EBUILD linuxsampler-2.2.0.ebuild 1736 BLAKE2B 4eb201a3026a0b354427f61ef28d033eeff6e62b9249ef3112f28d1c0ccdc054dd0e212655d6f353b581e48ee534d6d07d786994f0a98fd2628766389c59070d SHA512 c32b57b3d9803b820abb581a179c6d4851f011a7bafc6fe1d68bbcf5d1541d68fea81c18ffe2a6a728fccad89b9145641757faaf4a0451a6ee0a730bd398d3eb
+EBUILD linuxsampler-2.2.0.ebuild 1735 BLAKE2B 8133c90eea4922a25e5c3d36d93fe166c0d5f35ef0676739e4ebf1575707abd85790d47225d5cdfbb976ef9d8dfc7673f151683741e93b85c9f025f6e83d271b SHA512 7bc4f789a2471cd793371b388f1b4f89078e24701516e3a82bf6eccac8a2cc9bf28572642648af9db9ab759f7257484421971fdac55eea29f66a23ceda919926
 EBUILD linuxsampler-9999.ebuild 1563 BLAKE2B 9e429cc9f1877db28206ab161a952d3a0219a099a4d04aaa54f59a313ffbd4471a579a2e8b86d42c289af60da6518e7f2e6cdf7d01b8f30b5af39224aff81387 SHA512 cea0571ab48c8db627184052d56b9f0c8e6f3096d89dfff8ce2fcdf4a24e556b1cd06d75dc1b5baa5e50851d3bc12e3281f3c6d2d72347224d0b34da2455b3fb
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
deleted file mode 100644
index 7236b6df4f29..000000000000
--- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Software audio sampler engine with professional grade features"
-HOMEPAGE="https://www.linuxsampler.org/"
-SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="alsa doc jack lv2 sf2 sqlite"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="
-	>=media-libs/libgig-4.2.0
-	media-libs/libsndfile[-minimal]
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	lv2? ( media-libs/lv2 )
-	sqlite? ( >=dev-db/sqlite-3.3 )
-"
-DEPEND="${RDEPEND}
-	media-libs/dssi
-	media-libs/ladspa-sdk
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
-	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
-	"${FILESDIR}/${P}-fix-yyterror-not-declared.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	default
-	# Force regeneration of the file to let it build with all bison
-	# versions, bug #556204
-	rm src/network/lscpparser.cpp || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	local myeconfargs=(
-		--disable-arts-driver
-		--disable-static
-		$(use_enable alsa alsa-driver)
-		$(use_enable jack jack-driver)
-		$(use_enable lv2)
-		$(use_enable sqlite instruments-db)
-		$(use_enable sf2 sf2-engine)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-	use doc && emake docs
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	# lscp files conflict with nilfs-utils, bug #556330
-	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
-	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
-}
diff --git a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
index db469f65a3ab..b8df140e6296 100644
--- a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"
 
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index c29e8723487b..be09fda0a219 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,5 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
-EBUILD lollypop-1.2.35.ebuild 1522 BLAKE2B c699c58634ae71062603aa05880b71ca852a5ae134acb54a4d3b7f96460f5d443cef9e90527b408b89e1c10bfcc65238b4ab81c3e51ca4f176cd3cc5178f4b97 SHA512 9086cc448d207e3c1bf202cbf21a81a5bb9ca4c60a37b5c5e0e72ba16bb23421f6b7774c6e3c996da28e2506291710fe96170bee790b968b29859b15dc1d691c
+DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
+EBUILD lollypop-1.2.35.ebuild 1524 BLAKE2B 360da0031d44177ecf8e0965653d6238080a2360557ff732e60135a599f4f1e25fd647b2ebe60d618af1fd774a0cd82169d400dc1f9a9f5a28613a4b96b909f3 SHA512 d04d122dc72180395082b41c29617167d95735a7461d361f64b304b3f676ad5f1a3c37a290ef43fd840a440dda7dffdbdda4fb8fdc74fd5d929d1b72653dba1a
+EBUILD lollypop-1.4.18.ebuild 1542 BLAKE2B 87cd7eab1b8b9f7e4a85d3e6aa05e4ff330eed6621795789dc45f15dd217d18250c57bd4b149d8fa54c6b012d2cfaac8d766fedb4719aa3bc25ffb9a82142ac2 SHA512 fe03fd5397a2297576f03755c9fcc0f4268d801d9227aae677d1671749f15fa3aec27fa419a8acece354a678118e57ab0a5bcba2552666356f89759c347a7212
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 70b5f2889b80..7f583f5eecab 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 gnome2-utils meson xdg
 
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
new file mode 100644
index 000000000000..affb509a01eb
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.4.18.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} )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 gnome2-utils meson xdg
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo(+)]
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+BDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python
+		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')
+	gui-libs/libhandy:1
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 9a5f82761f10..9d69c4a7571f 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,3 +1,3 @@
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
-EBUILD mikmod-3.2.8.ebuild 468 BLAKE2B ce607f9ef7281cf67e83613937e8e457f7980ace5b11cd71082e7bf8fb09de88c2ed37ac56330c6c8554c12fb4ef683cdc7c629e91ced5741dc0af7d0966922b SHA512 da2419c35eec0c6cf8d2aa894a9b8f460690b74a3292dd1596f65587a3a34c299c30e750c36d84a61540ca87d5f56b35772b725aabe1800780e024d0ebe92719
+EBUILD mikmod-3.2.8.ebuild 475 BLAKE2B 6c6da2ac2ec2544c0567191ae1015662d58ca4b77f6e98b5ddfe5a90daaf9a0686c6a54909b4d11160eaf74f918e51fc771bf23796849bfdc33835f11f873056 SHA512 9afd87c8a7d7c164e25994db09cfcd6da25da716678c247708aaad5a4bc5dee5aaf1cc38f3dd2b53c693d801390c6d696de87319b3f090c3d268dc4023867af6
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index aa4da6360bd3..35c7ad01c3a3 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0b04ef487b6c..bddbccc25df5 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,7 +4,7 @@ AUX mixxx-2.2.4-fix-scons-compat.patch 744 BLAKE2B ffadce18947d538a8f614bc3c53f7
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-EBUILD mixxx-2.2.4.ebuild 3226 BLAKE2B a786466b637b5beada3fbdd4cf77a776d31ae490d96888f6765cd17cc755ca1ed8cae7584bd8629d28e3503dce7e93334f481d6aef37ec4f8abbb8b2764b8337 SHA512 a662f3d6499115657cc9586ca9c7f90c45097c55a5e2f9a76e88c411cd085d8f23bf9c487de1eb909e1038359cdfb9569d2ab9d4b1f8a186a4501f98c9d427c2
+EBUILD mixxx-2.2.4.ebuild 3227 BLAKE2B 6525da69abed8dcb6d0ace3aebd4660041c9fb15b2c1a6054ebd8dcde0fce2a65d3f09de3eeeb641afd9d289229ad4328a37ff8d3c7870217fc5ecab2ee7ec52 SHA512 cce7d885c7d2fd712961d5827bfce26aa0329b96aab0094baf264a19b8007f5df4088d88023ffc3366ea86fba4820c8740b664db87ddbb2c629a3b4f53fe64c8
 EBUILD mixxx-2.3.9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
 EBUILD mixxx-9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
 MISC metadata.xml 849 BLAKE2B 68fcb8b3e3353ad0c99ff9532c5b098738addbe5f3965bc931d5555f0110ee3b4a39514ae471881d8a4b0270d4257e502bd82d9010b235394ae3d0daf2ba4089 SHA512 eb222405a3de8c013d44b2fb114d42f32d54651309ec66176433ad055937a45d4dc7cc2cf3075a413ba508348100f74bd4c06ac77fc7960fbcf915d86bb02336
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
index da8c58ae71b9..12f5c4bf11dd 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8})
+PYTHON_COMPAT=( python3_{7..9})
 
 inherit flag-o-matic python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/mpdas/Manifest b/media-sound/mpdas/Manifest
index e29cae497c1f..5cf5d6fdc705 100644
--- a/media-sound/mpdas/Manifest
+++ b/media-sound/mpdas/Manifest
@@ -1,4 +1,6 @@
 AUX mpdas.init 429 BLAKE2B c1f85ad5006945a8d388b65c9fcc43168cb426b1afec6ca3674d2c706fed837fe3a6f24472831f783368ce6da8ed66a2604faa33f5b8197c1140b8f0bd192913 SHA512 0d2f7393abe0119cbb43dfaaa7593eff03456e8aa188eb879692108ced01b1980812e8336479e2ee94594537b77f2a9267e34c9a274d1a815bde77e2b3b8f8fc
 DIST mpdas-0.4.2.tar.gz 15695 BLAKE2B 907417050ab1b3d6577311e633b060dad2ff834b5436b7ed086ab5cb9ef291004916fc07cbe18ba4b80eeec8573775cc8e212b93d4ed103cbab3ce81082a18ae SHA512 cebd3c027002ac5283834edf3a1338b449c4a78261690cb5d25c57f767f1b0b81ff8ca5c64d79d6aecf5e86ba0c7b63a51131f6cc9031f2922e92eeddcada353
+DIST mpdas-0.4.5.tar.gz 19108 BLAKE2B aa5aec147574cc70572cada56ee495415a06ce5a8c4e19db7288ee1e52cb5d1b6f15a31955e46a526f9db1eff94bf282cb9804379dbd4cf979412ee7f575dde2 SHA512 18737f20b408a38424c46a611a1184e8e9ab78d1c3bddddc37423c8437007b87c343dfe03fd989c9c54dcc532ed1f567ba854d2ba8e12f344399267dc83daaab
 EBUILD mpdas-0.4.2.ebuild 786 BLAKE2B 2f7e22d31ead4fa20720e24068d880bd63e795394adf2f722d5fab3825bfdbdd030da5185e8d4c8575deb89abb88ab4ded35fd6752b970412d85a603c9a39747 SHA512 c58934b9d6cf1606fe844ed01486abc079e19ac206078627ab91fe38c0faa9af6bb5dc041e7f37aa515fd0b0c18674657e0bd3cb086e5d0f23e9183e10a05bb7
+EBUILD mpdas-0.4.5.ebuild 725 BLAKE2B 199b8bf3b2322427752f5e4d390e23c87234f0e0771fc745083ef0bc544eee0381aea32bd59a95d6f93cc07b235eea3b738382668a2b62f73e5959eed38ca333 SHA512 91eb667b3fff6d4815eff738654a1e92d74235708c1e91b5b5f6e7f502a38dfdf34f555992d50d1ae5c3ae4077351ac7128515a1974ac791113256b46bef9b6c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/mpdas/mpdas-0.4.5.ebuild b/media-sound/mpdas/mpdas-0.4.5.ebuild
new file mode 100644
index 000000000000..007f26dddaae
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.4.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="AudioScrobbler client for MPD written in C++"
+HOMEPAGE="https://50hz.ws/mpdas/"
+SRC_URI="https://50hz.ws/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/libmpdclient
+	net-misc/curl"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CXX
+	emake CONFIG="/etc"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	dodoc mpdasrc.example README
+}
+
+pkg_postinst() {
+	elog "For further configuration help consult the README in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 96c16f8d44a6..a2f92ceded78 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,5 @@
-DIST mpg123-1.26.5.tar.bz2 1051356 BLAKE2B c58ccb78b406bd9405c803d4d203a75ae981e3493fab84e15da49290d2d1b87912292838aa48c50cf192b8bcee4ea1bf18d89bbfc6df14452cb350356e6cbba0 SHA512 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
 DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
-EBUILD mpg123-1.26.5.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
-EBUILD mpg123-1.27.2.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
+DIST mpg123-1.28.0.tar.bz2 1063321 BLAKE2B a4fa37ac9c3aca867ac4f18eea9c2d39ed80c7e86908b2f5399da8ae82c2e4b57c1a041f17427702da14af9902051ce4de5a85497f7236963ae390ef8715327a SHA512 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
+EBUILD mpg123-1.27.2.ebuild 2753 BLAKE2B 129900b38d6e5464f19aec88b4b2894feff3d8c6023230f93c63e1fa5954658de8c9aafc10f1fa1b1dc2c70347667557576d9ecc0ef9e612aed17190ce31317e SHA512 67a19b872805005f14f719468c97ade3b94a2220e95dcced877e79b807dbf4826acf3c5f3673e9ffd644261d4cb28e4decb35be50de3d94bab71a77f444f698f
+EBUILD mpg123-1.28.0.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.27.2.ebuild b/media-sound/mpg123/mpg123-1.27.2.ebuild
index b8286510b25f..4d8fe02781d3 100644
--- a/media-sound/mpg123/mpg123-1.27.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.27.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.26.5.ebuild b/media-sound/mpg123/mpg123-1.28.0.ebuild
index 634c8ef13f42..b8286510b25f 100644
--- a/media-sound/mpg123/mpg123-1.26.5.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
@@ -32,12 +32,6 @@ BDEPEND="
 
 DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
 
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
 src_prepare() {
 	default
 	elibtoolize # for Darwin bundles
@@ -48,6 +42,10 @@ multilib_src_configure() {
 	local _output=dummy
 	local _cpu=generic_fpu
 
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
 	if $(multilib_is_native_abi) ; then
 		local flag
 		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
@@ -63,7 +61,8 @@ multilib_src_configure() {
 	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
 		use cpu_flags_x86_sse && _cpu=x86-64
 	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
 		_cpu=generic_fpu
 	else
 		use cpu_flags_x86_mmx && _cpu=mmx
@@ -81,6 +80,7 @@ multilib_src_configure() {
 		$(use_enable ipv6)
 		--enable-int-quality=$(usex int-quality)
 	)
+
 	multilib_is_native_abi || myconf+=( --disable-modules )
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 9c503ae7871b..ed332f230666 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,4 +1,4 @@
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.8-r2.ebuild 686 BLAKE2B 3bb3dfab9a41d2069b28f7606aa90d42e7615609617da04b6014fb3333c217fe0b536dbef6c8255d6321f26178c909bb21a42f4bd69979973fdf3cccb6e6e806 SHA512 43eb4cc537a812f7c2684cefa6a4eb167fede76991c92786c46557c1fef69861187b43dfdbbd0bf0f1f1c91ff8d93cda07e79d846e2f846044e9fd582095814d
-EBUILD mps-youtube-9999.ebuild 686 BLAKE2B 3bb3dfab9a41d2069b28f7606aa90d42e7615609617da04b6014fb3333c217fe0b536dbef6c8255d6321f26178c909bb21a42f4bd69979973fdf3cccb6e6e806 SHA512 43eb4cc537a812f7c2684cefa6a4eb167fede76991c92786c46557c1fef69861187b43dfdbbd0bf0f1f1c91ff8d93cda07e79d846e2f846044e9fd582095814d
+EBUILD mps-youtube-0.2.8-r2.ebuild 689 BLAKE2B 915acbe40e2e1bed1800c2c38856a0e9aa32bad2d9a8bf6caf0033c85f1271b720664c85529273c6d2532f160477def99f717659da4063d06aa2aabc6f748358 SHA512 24da8b4dc07aeab88c82ad253d32d4ab0d8596b59031f9178ef4787b3b7ca910ba72da791c8054ae3e076f8773a8344068e18f8d2a6f25a848222b811a24876d
+EBUILD mps-youtube-9999.ebuild 689 BLAKE2B 915acbe40e2e1bed1800c2c38856a0e9aa32bad2d9a8bf6caf0033c85f1271b720664c85529273c6d2532f160477def99f717659da4063d06aa2aabc6f748358 SHA512 24da8b4dc07aeab88c82ad253d32d4ab0d8596b59031f9178ef4787b3b7ca910ba72da791c8054ae3e076f8773a8344068e18f8d2a6f25a848222b811a24876d
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
index dd41c61da64e..82b44f71fd65 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8-r2.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
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index dd41c61da64e..82b44f71fd65 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-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
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index b36b59b9503d..d997931eba44 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,4 @@
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 EBUILD mumble-1.3.4.ebuild 3757 BLAKE2B 38b1bd1778be0290bf1a887fb615a7b8b247e324cfc4df02a816923962e3fe4bc58b7e298d7a4b50ee41b304a5c1f8d3574c675a33adc9af1331bb76028dd957 SHA512 0a450d16a7102a5b6b7c337999fa649d585cecd6ebf9bcddd7352a1806aa3e6ff580fc5b1687a4bd40ac1b1726cb461861a2f24ef84b7e403afcea6078ca197a
-EBUILD mumble-9999.ebuild 3001 BLAKE2B 3aec4e582c1ddd342d72ce457dbd2f8693ac5209eaeb3cc8a3b8d6301f1aa306bb9b0c18d09a056ddf1f14633c7422abc219cdf4012e9ff7185398ddc1c7b3d1 SHA512 924aa3db870ea5a8447e41e664be154bc97fedb0fe885e888a41d9cae9404018b374522a07be38b5fdef4074a05c7f8aa03b1134769f6221559b064175fe1cfc
+EBUILD mumble-9999.ebuild 3032 BLAKE2B f5dbfab60d82ea467f4b387fab941555ecd05a82ac80d67cc6dff962d049f3dd91ad9e59ed3a15dfdbe5c0c1981f6116decdf503526cad3aa2a37a5da6fe1f28 SHA512 6ff0537b360e770b73dd081aab902603f6583a268702d4aedc8d75619f9aa4dd9bb058d5cf70e4f0769fd037fd8564a041dcf7746831061d1c65db175d3fb5a0
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 88978a8aed86..260bec92b200 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
 else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 691d4eb54135..b1d3fda587a8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-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-2.6.2.ebuild 1672 BLAKE2B 5de4147997d5b24cd1b4e68b5c4dbcb045c86ce0d8e0dc9d1345f9875bdf12ccc19ce858312dfa0a03e7bc2bfdef77ddc196b679c4bff8f6308536d17a41b03a SHA512 8338bdaad722e5e1ea204fe194bd836230abab39e8bde5ec0ff5142ecf5fce46e7ed0eaac768dfc207b92c912b5fcb98915ebb31ec35cfec513cd593b7aa29a5
 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.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
deleted file mode 100644
index d866635fefb1..000000000000
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ /dev/null
@@ -1,72 +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} )
-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/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/picard/picard-2.6.2.ebuild b/media-sound/picard/picard-2.6.2.ebuild
index c395e2d4e271..d04919b37454 100644
--- a/media-sound/picard/picard-2.6.2.ebuild
+++ b/media-sound/picard/picard-2.6.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
deleted file mode 100644
index 74a9b4243c0b..000000000000
--- a/media-sound/protux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST protux-0.50.100.tar.gz 392027 BLAKE2B 3aad4eae28fe866bdff456b79ffcccba0658b97b06c29757757a1f7b8318a27c8e13166c0f6dfa0815276af4358dda031b9c2d869ffc007e9b21fb29d0733970 SHA512 8a7f241c1673193141f456367d40260bd9c1d9ec93130d51abebd14e1dfb03784a2cd21c6c72bce645bd362f138e52e5d41182358ea4b4dad50f892025b6dad7
-EBUILD protux-0.50.100.ebuild 1038 BLAKE2B 3f726e49643bd9e1a5dbdac1d207b954691789862e9c5b72b090740ac8e087e3c8ed0b12f03f39483762cd830b1f5379f4b4b2c811b172c4a8bebbb14ee52186 SHA512 8c5096a8a58c29e05c35252f57fbd627406bef000af828c7f24bbd738827739dc1e250535f06c7a85893191eb7fe82482ea9e5e36ab1d8733671c9e6befda1fc
-MISC metadata.xml 448 BLAKE2B b42a47762da30e666d97523b56e33df98e97ddedab954c4e19add0cde52d7d8cd73409d723419363ddf683922d697f06d3b8077f78524e62b5ee008c9f5831fa SHA512 6db37340b09ea0b4f18892b7868aeabbc50f4a9d2505332d9f927a9299fd0d13178a8e351f6378f1f5c55b6a9862a08323213995027ebf9f9e2f235c6d857943
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
deleted file mode 100644
index d1b3ad750f41..000000000000
--- a/media-sound/protux/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">protux</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
deleted file mode 100644
index f4f130c2bd87..000000000000
--- a/media-sound/protux/protux-0.50.100.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="Professional Audio Tools for GNU/Linux"
-HOMEPAGE="http://protux.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="source"
-
-DEPEND=">=virtual/jdk-1.5
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	# bug #318589
-	sed -i '/com.sun.jmx.snmp.Enumerated/d' \
-		src/org/protux/core/GlobalProperties.java || die
-}
-
-src_compile() {
-	cd src || die
-	ejavac -encoding latin1 $(find . -name "*.java")
-	jar cf ${PN}.jar $(find . -name "*.class") || die
-}
-
-src_install() {
-	java-pkg_dojar src/${PN}.jar
-	dodoc AUTHORS BUGLIST ChangeLog COPYRIGHT INSTALL README TODO
-	use source && java-pkg_dosrc src/org
-	# pwd like this because it does not find resources otherwise
-	java-pkg_dolauncher ${PN} \
-		--main org.protux.Main \
-		--pwd /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r resources
-}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 8ec3033781aa..d846ebab22eb 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 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-0.9.3.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
 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.2.ebuild b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
deleted file mode 100644
index 200a042d00bc..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/qjackctl/qjackctl-0.9.3.ebuild b/media-sound/qjackctl/qjackctl-0.9.3.ebuild
index 15137741a070..200a042d00bc 100644
--- a/media-sound/qjackctl/qjackctl-0.9.3.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 87998b816710..a134007c4e1c 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,6 @@
-DIST qmmp-1.4.2.tar.bz2 1295867 BLAKE2B ce282f543dc6b14ccd027aa9a4ad85f190a8aee149049798ad5e51bf944cd34ce7773dcfb7b6ea4bdf0a8a69baea430802f04de631e9b12b68d2d23a8c599461 SHA512 00ed0c4bd74dc50294c9d8e717f249a577fb26f5d4eb93dbc42c6c79964188fd885ab577904dea5aec31db0d2b828d7038febca1ffdfd2f4bfe81f931bbed7ff
-EBUILD qmmp-1.4.2.ebuild 4049 BLAKE2B a8fec81aa1ae3d48da3785ad3d053a7f6e0dacc7b34fe0a4e6946f8e56df3677045617f92b4cea827682bdca444ae0bcbca4b14e4281b5df1459dab0548787f5 SHA512 aff0ba05f9d2ee7eba8563888827a1f74d9b0f44e13325ea9358231efb0ef9b7ae459327a8652aecdfe7b633bdf133eab552a55938c4df0275ec82b693c05655
-EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
-MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
+DIST qmmp-1.4.6.tar.bz2 1297295 BLAKE2B ec0b27c5faf2c76c15ff8594eecad8b6f73bb5fefd60e4916751a297ff055b252762c8e1ff6d6fc75535bc299159fc595e95767977958a8e94ff2d13218e6fb1 SHA512 dca9d06763be6ded45db14a5e8967e9bd8eebc14e5ec7b077171417e942d61a904ecd1944b8d80deecfb642248663739c3e1784449a10466475deb6e575ea7dc
+DIST qmmp-1.5.0.tar.bz2 1337043 BLAKE2B 71da332bb125ddcc37cdc159e155af2e185cfef8f70348484ca6099666a4715258fadb8a7db68329a009e0d727b1d7b000553e34eb56552c229b6cc1a5f3dd45 SHA512 b8a29bf6b2f6da08e1ff2801c973821663570de436562ba79b40212b8b8522f0e25ea79c941bfacf252904851ed477cbfa66d7f145b172f93a105127894d5e04
+EBUILD qmmp-1.4.6.ebuild 4049 BLAKE2B bdb6ba0a6ad610e92d46d42371c66ef1a965e85bd565fce5e2f2295fd3ade3cb063414a29e523599250b0a743510459876f63bf1b8973e9449fbb06698eaa0f8 SHA512 67657e3a6f89c33c166f1aa34d33446c58ad3d77b18dad4b05560d228effa93603d9f4421621bc1bbd785a8ae3f9099daa0d9a78dbef277f75f3c34d691283e5
+EBUILD qmmp-1.5.0.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
+EBUILD qmmp-9999.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
+MISC metadata.xml 1882 BLAKE2B 05e4092242842436df6f1dfcd82ab4b7a08675668d6ff5817dc7901bafdeb1725ef26fe7529cf38ca7a5f3edcded04cbee82c3d2bc44644e902b29c238a671f9 SHA512 790c2d0d07117a51a9f33f4575a871e839d1fc403309d765888f98aa532292d8e7dcfc23ba127037babc48272927aab9aae37781b9264991606115690eeb875c
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index eb5b4f1891fd..69fe0dccdba7 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="lyrics">Fetch track lyrics from the web</flag>
 		<flag name="midi">Enable midi support using wildmidi library</flag>
 		<flag name="notifier">Enable qmmps' notifier system</flag>
+		<flag name="pipewire">Enable PipeWire output plugin</flag>
 		<flag name="projectm">Enable projectm music visualization plugin</flag>
 		<flag name="qsui">Enable QMMP simple UI</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
diff --git a/media-sound/qmmp/qmmp-1.4.2.ebuild b/media-sound/qmmp/qmmp-1.4.6.ebuild
index 2e5fa0978838..2170cb945e31 100644
--- a/media-sound/qmmp/qmmp-1.4.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.6.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
diff --git a/media-sound/qmmp/qmmp-1.5.0.ebuild b/media-sound/qmmp/qmmp-1.5.0.ebuild
new file mode 100644
index 000000000000..2fe547a222c2
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.5.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 45e48d80e0dc..2fe547a222c2 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,9 +20,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -58,16 +59,17 @@ RDEPEND="
 		virtual/jack
 	)
 	ladspa? ( media-plugins/cmt-plugins )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
 	projectm? (
 		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qtopengl:5
@@ -94,7 +96,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
+	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
 			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
@@ -136,6 +138,7 @@ src_configure() {
 		-DUSE_NOTIFIER="$(usex notifier)"
 		-DUSE_OPUS="$(usex opus)"
 		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
 		-DUSE_QSUI="$(usex qsui)"
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 7915bbf1c806..b23333ffaead 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,7 +1,5 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
-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.2.ebuild 1149 BLAKE2B 24adc485f6dcbad6d34712d9021b622a3db66d0094558a83fc6dee56eeb083ab10159569d61d641883e8574c691417e69cc518da9560b982ea4237da1144fd21 SHA512 d98e52041849c6372faa209d2983d63c307346637c021901111286bed5eb73fb4ace7132e76e7bb817f31d22b41a927a47b9f92deb49a0263f33c0a55f309282
-EBUILD qsampler-0.9.3.ebuild 1150 BLAKE2B 7eef5a0385db52a6a8ecf942bfa8b18adf797c9c62c45b3dd53e7901a8dcedfa33a9ef51c9f75fc3e3a979f9efff59a3e9815562b907392dbeaeb8af03214295 SHA512 96fddbb2518d4c28d14ec7bdc37490110d3399f0160154a170e9671d71245ccd9a5bd1cc9a92df9d0e04716a454579c13ca18a417996a0cca0624845b1b12675
+EBUILD qsampler-0.9.3.ebuild 1149 BLAKE2B 24adc485f6dcbad6d34712d9021b622a3db66d0094558a83fc6dee56eeb083ab10159569d61d641883e8574c691417e69cc518da9560b982ea4237da1144fd21 SHA512 d98e52041849c6372faa209d2983d63c307346637c021901111286bed5eb73fb4ace7132e76e7bb817f31d22b41a927a47b9f92deb49a0263f33c0a55f309282
 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.2.ebuild b/media-sound/qsampler/qsampler-0.9.2.ebuild
deleted file mode 100644
index b1939a889744..000000000000
--- a/media-sound/qsampler/qsampler-0.9.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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/qsampler/qsampler-0.9.3.ebuild b/media-sound/qsampler/qsampler-0.9.3.ebuild
index d948252e61b9..b1939a889744 100644
--- a/media-sound/qsampler/qsampler-0.9.3.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 86f640720830..4671e0d2d174 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
-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.2.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
-EBUILD qsynth-0.9.3.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
+EBUILD qsynth-0.9.3.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
 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.2.ebuild b/media-sound/qsynth/qsynth-0.9.2.ebuild
deleted file mode 100644
index a9c46977ac25..000000000000
--- a/media-sound/qsynth/qsynth-0.9.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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/qsynth/qsynth-0.9.3.ebuild b/media-sound/qsynth/qsynth-0.9.3.ebuild
index 59c6e5666ca2..a9c46977ac25 100644
--- a/media-sound/qsynth/qsynth-0.9.3.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 182ab39ff541..d12c92c30713 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
 DIST rosegarden-20.12.tar.bz2 6438971 BLAKE2B f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28 SHA512 a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2
+DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
 EBUILD rosegarden-20.12.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
+EBUILD rosegarden-21.06.ebuild 1135 BLAKE2B 350774d8cd0f82e86e09db77fb81eb338cfafdad02b74afcd8cca5677bd65eb517bce08f8fdc1389836d0bddf75ce412cfcacd318281dfa7f3a5837c79a00159 SHA512 06d439b37e18cb255f3c0d591e71fab48e3646ff645ff01630c9a6e509bb7baf70dd1012da4c19251ef999f922b3a2dea7d01da0104a4ce1cfcad404fba66cd7
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-21.06.ebuild b/media-sound/rosegarden/rosegarden-21.06.ebuild
new file mode 100644
index 000000000000..6cc3ac2b875d
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-21.06.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_LIRC=$(usex !lirc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
+}
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 2a7c8e94b5ba..8d6ff1099999 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -2,5 +2,7 @@ AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f
 AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
 DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
 DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
+DIST sc2mpd-1.1.8.tar.gz 244898 BLAKE2B 81c3ff1b25db25cbd1bdb50f2343acb07740611dbad504fcc4670a6d351c1daace481de5292f291bdf208a911f67f4ebcc0884c0ef9eece962114860941e1941 SHA512 214b60ee154ab84e9a7ace285afa71b015987c6b6838fb2686cc81f65800f10228cc3f52e5f5e7e836fa181ea6fea5b0c4c83acc5c6eff989c82c79990f19497
 EBUILD sc2mpd-1.1.7.ebuild 3242 BLAKE2B 4a77568b4e07680e93b5e6acde2e076c1b3620942c2d9ae672e823c1f1f65b018b27b510ebe9a1dc420d89bcac79ddaa3adb662834fd3220f88c1c1c6fbbb763 SHA512 abba0c2c796c308eb1c52433e6d234c0622050bb1bd74b27405dcab27cbce2ff358ae8c50eae9b66a495bdb5ae90e3587e3fbf48d7d86de8fc36b1e9321dd53b
+EBUILD sc2mpd-1.1.8.ebuild 3071 BLAKE2B 7a6eab05845475eaf37248c5981d2961a090b3048efd26ef13a0016eeee9938e8b2bc372cb424ca3b6dbf46beb5181a6f7e635f7261c5916bfb6b17bdde83da7 SHA512 c43af142ee6c0b604f0cb7e209a19004ca76e24706edcb98f9f3b00df74c51759b2eee42cf6ca7273701df5f49c2502b88111c0da204ee23bf4e606034b27bd8
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild
new file mode 100644
index 000000000000..ef6557395fe1
--- /dev/null
+++ b/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+
+openhome_packageversion="20200704"
+
+SRC_URI="
+	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
+	https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/alsa-lib
+	media-libs/libsamplerate
+	media-libs/libmpdclient
+	<=net-libs/libmicrohttpd-0.9.70
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mkdir openhome || die "Can't create openhome directory"
+	cd openhome || die "Can't enter openhome directory"
+	unpack openhome-sc2-${openhome_packageversion}.tar.gz
+}
+
+src_configure() {
+	econf "--with-openhome=${WORKDIR}/openhome"
+}
+
+src_compile() {
+	#### Begin ohbuild.sh reverse engineer
+
+	# build_ohNet
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	einfo "Building ohnet"
+	emake native_only=yes
+
+	# build_ohNetGenerated
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	# TODO: get from environment/make target
+	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
+	mkdir -p ${deps}/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
+	cd ${deps} || die "Couldn't cd to deps dir"
+
+	ohnet="${WORKDIR}/openhome/ohNet"
+	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
+		 -exec cp '{}' lib ';' \
+		|| die "Couldn't cp binary libs"
+
+	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
+	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
+	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
+	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
+	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
+	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
+	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
+	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
+	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
+	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
+	einfo "Building ohnetgenerated"
+	emake native_only=yes
+
+	cd "Build/Include" || die "Couldn't cd later to include"
+	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
+
+	# build_ohTopology
+	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
+	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
+	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
+
+	# build_ohSongcast
+	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
+	einfo "Building ohSongcast"
+	emake release=1 library_static
+
+	#### End ohbuild.sh reverse engineer
+
+	cd "${S}" || die "Failed to cd to source directory"
+	einfo "Building sc2mpd"
+	emake
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index b862ba1dae82..3736cfb98b02 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,7 +1,5 @@
-DIST schismtracker-20190805.tar.gz 1307914 BLAKE2B 97158f05b55063173fb3a8198d21d4c3f33a1c9d2882170b8dbce91dec75863ae1f282297c66fea376fc94559b9492477dadbc3e2516cfb2dda8772793f59124 SHA512 6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d
 DIST schismtracker-20200412.tar.gz 1308056 BLAKE2B 8c104d92889982310d895b9d432ee8bf6da75f583d38490d6796718411298aa0627cc268e070f8c679de4341c910507f78e394b5ba8aeb5b71b3410f2919aa35 SHA512 f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b
 DIST schismtracker-20210525.tar.gz 1309489 BLAKE2B acc295bed4236d3161fd67a8c97ddadaa07d6d6319a0ad75710fb4d3c7ea251edd2648932533e9181b512fd78b54db929b07e3472ff754220f16cca2bd610932 SHA512 1f20535e4e3b5175ceea803a45b7286a99cab248829c39d11bc85780bc63e0e26c49ad78997a13e290fb4ad2c292d15eeb494a975d53fbe25dec80499e675b16
-EBUILD schismtracker-20190805.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
-EBUILD schismtracker-20200412.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
+EBUILD schismtracker-20200412.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
 EBUILD schismtracker-20210525.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
 MISC metadata.xml 355 BLAKE2B 90bb7342fbf7defe952aaaa3a65ad1e1144455314d8a2af7219805450a9e3a3df9b0fb9b334c8eec07af7f4f1296e49cf2c9fd3ae750b77f4a5325efa5524337 SHA512 98760ffd7921d91711f3293f3650270ee8de44f7d143066e9d6861b020dd4fe06fa4083ec1a4022846aaa47187151dab2847cd2fe9c571a5c251fa917effea9d
diff --git a/media-sound/schismtracker/schismtracker-20190805.ebuild b/media-sound/schismtracker/schismtracker-20190805.ebuild
deleted file mode 100644
index 1c2988cf91b2..000000000000
--- a/media-sound/schismtracker/schismtracker-20190805.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libsdl[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20200412.ebuild b/media-sound/schismtracker/schismtracker-20200412.ebuild
index 68df087a73c5..1c2988cf91b2 100644
--- a/media-sound/schismtracker/schismtracker-20200412.ebuild
+++ b/media-sound/schismtracker/schismtracker-20200412.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index cdd6c5da9ea5..f5ba5017d908 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,8 +1,10 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
 DIST spotify-client_1.1.55.498.gf9a83c60_amd64.deb 133771326 BLAKE2B b4f17f3008e23cfc9b1cd7ecd806ae97b846f22b39be5ee25515111e6641b31b1cd6525f0cc6b5540d3bce03adbcc23940db26992642ec3884b46f919f499179 SHA512 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
+DIST spotify-client_1.1.56.595.g2d2da0de_amd64.deb 134092920 BLAKE2B a1b836a8c7627254203326c6168dd8351d1c0e527a94e26ec96f9437b72196a717e2cc460b4c89da4098d19d5de4c6f7df150b039a32240b9edc978253590d16 SHA512 4a270461d07c339a3fdf49cd0a8728d4fc7300be001a1ba59c74f05bf273b79a61bde6d046c27a6af38dfb6af58963fbd8b8cd7468c91b91e48b0d32b3dcc2b5
 EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
 EBUILD spotify-1.1.26-r1.ebuild 3133 BLAKE2B 0cb705233a3c73afb3199e47d96a97e53eacf2c6cb190c421a3412d6783f6c966de1089b147cb086a3e0228862d392ded5ac4ec1117eda21c4bf1a84617bc91d SHA512 8f0ed03641ffa16d447925f24e9f53c01507cea74b860d3c8f5dff2b3df1895cdbd47c2484fb8c316b9e3fe2723d00cafe1934d57eff17f217d28a6bc06aca53
 EBUILD spotify-1.1.26-r2.ebuild 3389 BLAKE2B a54b9a095c1e17dd5f20f1c3c4c44a687551c06553724d795527c1399cc4a4456676a856d27da6dcb01fef36fbf611f3bf1cd4c794c032322dac6b368b367262 SHA512 5fc0016a01a26641c56155ca516fb4f42b6c9a2d88143c335da7f8bea28d8ab36abd11c411867ec9e7bcca794a4d360e18b92a929d4d0aa57435008a4c7369b5
 EBUILD spotify-1.1.55.ebuild 3452 BLAKE2B deb0bcd9286a1f9c1021f4d3d8277568da170cd7a48250f21a48354158125d9a187038b4366260d4765d3730957cb185dc62060a615dce7ba11bc530a4cc06fc SHA512 8a7b3d41dc2f3be099aa9ba3fab6b84dee0a95f06776995ae11c7ca52f058eba83d7afa769dcab70ce8490f57f25bcc957d6e28075d87e3069f15275800736d3
+EBUILD spotify-1.1.56.ebuild 3452 BLAKE2B ca08758cc97998d21f347aa33486bc53a0aca375165bfe6f46ec090ba0b38657100e508900163ce1b06e7213e2037add979e0a7d9f869d226f43ff93306441eb SHA512 8e0edbc9c88db5946ef6687ba26faed2938f1dc7801c6cedaba1d14de3f6f105ae509643c51413438769a3212584202e44711ee789b69aaa760c3a07270bc83b
 MISC metadata.xml 632 BLAKE2B 4c68e175f8bfe81df9c89a76d97ea02c71cdb7a7fe1737d95ae20a49840f734372953fbcfaa8af5ecd918ee1444fabacff223487707e9d0e76993d94f6878b8d SHA512 2947ed146739cec0abed1142356d5fc2d8d32251fe117cb7f999b1e83e65223b93700106913db90a41718ca7a88f3a42661af3617ae1bde2e695907e746638ae
diff --git a/media-sound/spotify/spotify-1.1.56.ebuild b/media-sound/spotify/spotify-1.1.56.ebuild
new file mode 100644
index 000000000000..7a6cfcac18ae
--- /dev/null
+++ b/media-sound/spotify/spotify-1.1.56.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop pax-utils unpacker xdg
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="595.g2d2da0de"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify local-playback pax_kernel pulseaudio systray"
+RESTRICT="mirror strip"
+
+BDEPEND=">=dev-util/patchelf-0.10"
+RDEPEND="
+	dev-libs/nss
+	dev-python/dbus-python
+	dev-python/pygobject:3
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/openssl:0=
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	media-libs/mesa[X(+)]
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-sound/apulse )
+	local-playback? ( media-video/ffmpeg:0/56.58.58 )
+	systray? ( gnome-extra/gnome-integration-spotify )
+	x11-libs/gtk+:2
+	app-accessibility/at-spi2-atk
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libSM
+	x11-libs/libICE
+"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="
+	opt/spotify/spotify-client/spotify
+	opt/spotify/spotify-client/libEGL.so
+	opt/spotify/spotify-client/libGLESv2.so
+	opt/spotify/spotify-client/libcef.so
+	opt/spotify/spotify-client/swiftshader/libEGL.so
+	opt/spotify/spotify-client/swiftshader/libGLESv2.so
+"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index c3898a38d750..d1315a8b99ce 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -6,6 +6,9 @@ AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
+DIST teamspeak3-server_linux_amd64-3.13.5.tar.bz2 9950540 BLAKE2B 0ba97317364a2b219d98d7c9590355a8ce62a91f1e6b1b647d5a00643c79fe197fefb548c872f54ac2b67612eef4d97e36c7bbdb59647ab061520ad2295344ab SHA512 c190ff1fccea71d90fae70e5786a4b6d269161a073f4a10abf24c9c75e694eae2b49e8aabf3dcb1afbcbc4242e1a8c6616e39b950c719ccebb47ad49d8a4f8ae
 DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
+DIST teamspeak3-server_linux_x86-3.13.5.tar.bz2 9784415 BLAKE2B 54fa526f2fa4ebade068faf1c7e6becdf34fd70bc12771f90b454c9adfdefb5fd61ee4cc9e59c20041cd2387871598c7bd900845cdffbb822b2ce238a826d861 SHA512 05a5440dd7a18f9af1023f9ed98626f0e68a31375a7d5debfa401601a743546a44ff2162e92a18bfacccf5a1b9f5c4218bd5ea82ca5700133c30be70ffb0aea0
 EBUILD teamspeak-server-3.13.3.ebuild 3510 BLAKE2B 8b7c969ca30aa7683c506f730e135ba127ecb6b7d0eac50dcd7b6286e445c8bdeabacf96cd79cb1a591e00aa29193eb29d98e7816da386c426afe97309166a44 SHA512 a6d75c808865c5f8a48ce3a17671ff242b34e82bf83672be8dc779945db8f02816a0d55c28900b1a96e77e1e067db0c375bd9d6082d21b3ba8b1c927148fa551
+EBUILD teamspeak-server-3.13.5.ebuild 3512 BLAKE2B 9d4f0b1f7a231d27ecf678ddaab6289c4a9042169f0602257e339f07e5ad2c7e4b2b788f789f93a98751b5081a3bd5a47753f9b649f638069e12f37dbc658ee3 SHA512 108c890aa92790ea077bb03733beb1806ce0c0d651efdba042106e6029b7fe81912e7abdfb97e5cb84cd737088bb2cb9e0cc94db0b1718b4a3759da87a3de681
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.5.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.5.ebuild
new file mode 100644
index 000000000000..bd2a13a829c1
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql postgres tsdns"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+	postgres? ( dev-db/postgresql )
+"
+
+QA_PREBUILT="
+	opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_postgresql.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver
+"
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r2 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.{md,txt}
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r2 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use postgres; then
+		insinto /etc/teamspeak3-server
+		doins "${FILESDIR}"/ts3server_postgresql.ini.sample
+		doins "${FILESDIR}"/ts3db_postgresql.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_postgresql.so
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_postgresql
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use tsdns; then
+		exeinto /opt/teamspeak3-server
+		doexe tsdns/tsdnsserver
+		dodir /opt/bin
+		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
+
+		insinto /etc/teamspeak3-server
+		doins tsdns/tsdns_settings.ini.sample
+
+		docinto tsdns
+		dodoc tsdns/{README,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a license,"
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
+}
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index d11ee86788ef..bef32c92935f 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,8 +1,4 @@
-AUX wavbreaker-0.10-pkgconfig.patch 350 BLAKE2B 85657b02fcb5b6f7c9be8e81217bc02c816732f57cf51e3cde17179dd71d62df46f05d378910e06702419a822a050a4840b6c5433628e6f56dcc791f9d5e67c6 SHA512 a8f75bc1592b4aab528175a055936fc23d50a266b8aaee317fa6039c5ccebed2e02db0454b2b4d6494fc8705ecd39bf04dfa485de6921961e53347dead9d0d45
-AUX wavbreaker-0.11-QA-desktop-file.patch 211 BLAKE2B 64b1f3198a0cafb45b1d81978e1b61e06140f97aa4f01145513d8f2e8361b90d918fb299fa5318031b902d0c89695a93cf882794d8a35ea2b177197649636cb0 SHA512 375cb7f844726439ea06feee9360029d59de86ca1eeef8bf9b312e1a4b2207841ca6a6fa6dd8f947481fc74c45f44587adc1dc1f01d3e0485f783cdf872cc548
 AUX wavbreaker-0.13-QA-desktop-file.patch 323 BLAKE2B 7a4414df32591399f7fe99a2f15e2a8d78a4da6ac435e69943cfa4b50bad5f41842a386f2de6ab048bdc9bd1cac0f26fa68b95923530cb140cb2a58e4fd7019f SHA512 a167b438504b7b88bc538ca45fd700ee5072e671c20830a72749f0bb07d1ac1430a438c17c5e7f1e3cc3ff6fee208c976e273d8600d528540742ecb7197b09bc
-DIST wavbreaker-0.11.tar.gz 496733 BLAKE2B 2ecdad2f19071d672eea4960883af3f1e5b034d43307896cbd9caed9fb087579124851cab6fbfbc54276945c6b229f2ac6f2e7b9b839d02487569b08d65b0210 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1
 DIST wavbreaker-0.13.tar.gz 366998 BLAKE2B 4f863699d6e0c5573d4af615a0ae8cd1d4d1b2fc74cc060ab8d0fb298e57812a8675b641bc69a45ae1015b3e6c0731a228aee773caaeaed75cafedf065dbbff0 SHA512 3585bdc6eb937d02ff8287c370a2f480dbdedfc6304505ee45943ed34e4302af480bdea511f7d4fb6778b9f5b25a435b533392eedac9869c650202645a64c574
-EBUILD wavbreaker-0.11.ebuild 888 BLAKE2B 34a183a5805485fe742795d91c106d2ba4dcf889924c230c0da4538628b5ad55fb1c567200f01cb254b85d842e0bcd78ad288ad12b42528d622c00837fd64ec2 SHA512 748402257cd0f0db7472d371b756636c95f405a14e8a40bc3085bfad3c655376f1ec73d1b78d0d9d7c76d3da9c340b87857cbdbce136a44358ec7cb9bd818e6c
-EBUILD wavbreaker-0.13.ebuild 647 BLAKE2B cd4654e658cb97b7f7ea729f5974d3c1ea6bf9426745d4b6bc4c2617bee65fd9f919214787fba08a0bb9f46d8cd871fe00abc0b37007e8f1f9271291513a20e4 SHA512 b01a6d712cfda389307b3d14fac4d23cffabadc7a10cf1e24b684f4c2d79401c95826e6e7d93c356b38c1dcdfefb0a3516e820292508dc0cebc5cc16cd23783c
+EBUILD wavbreaker-0.13.ebuild 645 BLAKE2B 72c73afc027d5465fbc67619e499694d53ba8b6d87d262519b614ca9b8f398ad576f2713200e3ba43d6236d00c663f3a87e2292cc0dcd826c891f8cfaa5f0dc6 SHA512 61939436c0305cdf02acbdcf2820a92a64a352c0fce22088d4d6558525485fafe072448bf2176e035a57b471dcf8f1ed534015429224090d963e59ed22e844d5
 MISC metadata.xml 387 BLAKE2B 329d78b990cc196a7c4be49a461e315932d750ab7784253e18d188ef07e7f33ef63f3bec81d3d1465bb0969470e914ba33f241cc555f4ee4e5eeb84eb56f0748 SHA512 40e053f7daadf827b7d6d07b72d315a5baa1ea9c2896fdece467dc772f6fb0f294108acc9d34df01b3c0e57ffe4daa40d77f2dab0b6d1af3c023d89a19bf1e8e
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch b/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch
deleted file mode 100644
index 06a3d04adcba..000000000000
--- a/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur wavbreaker-0.10.orig/configure.in wavbreaker-0.10/configure.in
---- wavbreaker-0.10.orig/configure.in	2008-06-02 09:44:27.000000000 +0300
-+++ wavbreaker-0.10/configure.in	2008-06-14 15:28:26.000000000 +0300
-@@ -30,6 +30,7 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_LN_S
-+PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- AC_CHECK_LIB([m], [cos])
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch b/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
deleted file mode 100644
index c382e5e5dd19..000000000000
--- a/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/wavbreaker.desktop
-+++ b/wavbreaker.desktop
-@@ -9,5 +9,5 @@
- Icon=wavbreaker
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;Audio;
- MimeType=audio/x-wav
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
deleted file mode 100644
index 157cac408b8e..000000000000
--- a/media-sound/wavbreaker/wavbreaker-0.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
-HOMEPAGE="http://wavbreaker.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa nls oss pulseaudio"
-
-RDEPEND="
-	dev-libs/libxml2:=
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib:= )
-	pulseaudio? ( media-sound/pulseaudio:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10-pkgconfig.patch
-	"${FILESDIR}"/${PN}-0.11-QA-desktop-file.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable alsa) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable oss)
-}
diff --git a/media-sound/wavbreaker/wavbreaker-0.13.ebuild b/media-sound/wavbreaker/wavbreaker-0.13.ebuild
index c14b99f53615..7ecabeb22733 100644
--- a/media-sound/wavbreaker/wavbreaker-0.13.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="mp3"
 
 RDEPEND="
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 2cff3288a8e4..ca5ef9e49717 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,4 +1,6 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
+DIST whipper-0.10.0.tar.gz 256546 BLAKE2B c673aaefa8fe621e11a1140c2927bb2f62d5b07e94f6cec5b95ba290e5eab215c98b9a59c144b26c71bde211a45d603ba08c477d12b12ed1c73f9f8c2ebdb9a7 SHA512 728ad98185aa2d29f4fb215a597136691bb2c3590b3cac4f659238f90a3b4328c377fafe830a725b655f050538739f404b3eca853db4c39001d1b9d721dc7fd8
 DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
+EBUILD whipper-0.10.0.ebuild 1288 BLAKE2B 2ecffe4fa7939f85042623bcedbb5202a915850217f3a762d9f9205fc24c8a27865819579b1a6a1335b4a5fdcc6d96be9397f95760322602dc2685fd0444ed41 SHA512 e34bb666cc07104f80c386c18aa7bc9fd4a0799a911b37dd40a9e17cee546a2ff40b94908cb38a13451dbd3871c71d5d224de3e118385df76c89f3739d79647e
 EBUILD whipper-0.9.0.ebuild 1241 BLAKE2B cf63fcaee645e139ebea91a7582980122893c0ca85d369c65eb45a7972c3d2f5c2aa717ed8251ffd9537c4ca51c97a4eef5e9793cf9dc00c412c2d98e58a4f1e SHA512 bc9a505cc0523496265d2f8684a79853a3807f99f3751c5e74a8ca0298ea7902b9be653af6232e68ce81d7858e4f55e9089d9d4c6344a2e21651c8d8edba0887
 MISC metadata.xml 574 BLAKE2B 6af7eae8e89d5522a54e3fd3de786b42e63b5c656b938edee4022f104c00bc2f8579145fbb71ad4d0bf285d09315145efffa372a92908fc656f4a5a0cf3afef3 SHA512 a42d696b9a6156aa69d94f3f60a520326c4dc250806e7670c33def7f80e7d233b97bdcc45ed947ba358cbae767d0d17c12b83966dfe96dcb703c07a0d90c072b
diff --git a/media-sound/whipper/whipper-0.10.0.ebuild b/media-sound/whipper/whipper-0.10.0.ebuild
new file mode 100644
index 000000000000..964e6c65cd23
--- /dev/null
+++ b/media-sound/whipper/whipper-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/libsndfile:="
+RDEPEND="
+	${DEPEND}
+	app-cdr/cdrdao
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-discid[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch" )
+
+python_prepare_all() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	distutils-r1_python_prepare_all
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index bd63bb29492f..233de54ea494 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 8272 BLAKE2B aab42ce7f2c0c35c39e840f54d51f47d7648a0937ea15c6398a417a124ce63197cb82a0059408ef343075fcd318573e470d336a13c0018d4a8da23d9b7cced72 SHA512 a30285032c694e99b90ed8c2eef973f91b96603f35546c9ce58abef4131e4caaeaad2d94953a95185b2747f56f005811020b2c479cc57ac2f9ced02904583f9a
+EBUILD xmms2-0.8_p20161122-r8.ebuild 8264 BLAKE2B a602b991508a72aeef06ed67f9a3a2bae2eef870d529298b9470a31444a26d84593efd97ff3bcd38e9b07433b24c11d1e716ab8dc4f7998eaadff2831fa35a0c SHA512 bb738a5582c5178e76edfbc6595e42f01f24120f1591724985da29c74ec2b0163183728912f4332fb0afe53fadaf803771b7197f9f547cb3cdc4a3ca4492c6fd
 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 11574d0fe0a9..a94f72c6506f 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
@@ -13,7 +13,7 @@ MY_P="${P%_p*}DrO_o-949-gca15e830"
 WAF_VER="2.0.19"
 
 DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+HOMEPAGE="https://github.com/XMMS2"
 #SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
 	https://waf.io/waf-${WAF_VER}.tar.bz2"
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 6d0e61302aa0..8f15bf0c2927 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
+DIST yoshimi-2.0.1.tar.gz 8899523 BLAKE2B 4738696773d4542c1ed14b07025f1045b7b65230774fe627b69bc5948dd4e56bb4841980812e33db015a0d509c11a8ecf4c2d5efb6572a4c30e697eb5728fcca SHA512 2e23ee811bfdbad4ca70d32c627d471189122cbf5db2d89d75dd4b3e5116d7d9b97db52be1e218bedba0a28cc1978a923c267d954bc7e44d9d1a07181268268a
 EBUILD yoshimi-1.7.2.ebuild 1009 BLAKE2B 397418f1d46c1d38a169b3547c8de577679b6f2fab97e06b899241487315a9273d23fae70b904a298ecfdf89f86ed88800d4c0618c2fb0b48fd1f9ccf1364376 SHA512 309654312886da14c56d25878944380259d1a9754b8066aa8bdc8ad93abd5499730fbcc20b3fef0fbc79b5612025d74a19c1435d55ec83fa53e38927f6b04b26
+EBUILD yoshimi-2.0.1.ebuild 1005 BLAKE2B 187ff9d4a64f3f3ceb58b3ea288aa0aa1c58ce72d71a729906060183b22bfac3e6fa60d04d22a3e8542c53657d6c9ca4416476ec2769e60406b375b599d6a18b SHA512 948a96b1b44ef68d759a64114648cf86ad07579d7d4d47cd0e5d3b55379049f7500ece2a347c3bbc72969a4eb15505d1d5bdf567476f0bcddf33037a7622f092
 MISC metadata.xml 1413 BLAKE2B c294d4bd44ddd5a51ae0294e12e053633da91e3ee4f6e71786e68d3ea674ff3966cd5992b5d9e7c43c677d64e3771662c23760b8e74a9382bd9118ca5e779a8c SHA512 d35e3df2eae6868adf65f4cb5f9e9306c9e72f930c427a01816f2dfe7b32e07641ea91c6829e7ef6c099cb3d7136541b2deedbfe926d50be66d364042c054ba4
diff --git a/media-sound/yoshimi/yoshimi-2.0.1.ebuild b/media-sound/yoshimi/yoshimi-2.0.1.ebuild
new file mode 100644
index 000000000000..ae3192e6c50e
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-2.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/mxml
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /media-sound
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)