gentoo resync : 25.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-24 23:59:54 +0000
commit: 401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree: c2bef4719f6787550f0916aeaa8f4f403a9296af /media-sound
parent: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)
50 files changed, 495 insertions, 235 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 82341e086fa7..39c8d836fc6a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/SmarTagger/Manifest b/media-sound/SmarTagger/Manifest
index 231b9b79b999..e7a6d30974a8 100644
--- a/media-sound/SmarTagger/Manifest
+++ b/media-sound/SmarTagger/Manifest
@@ -1,4 +1,4 @@
 AUX SmarTagger-0.1-gentoo.patch 343 BLAKE2B 7b7881713fd0cebb49779ab5c40a69f63b420ae5ae2b9686050e75c52a37ea931cd169aed1765208adc1e05b7edfc21fcd635e90317843fbc3e21b363dae3011 SHA512 0ff0e4bfbb0d834d767ad0c2c5ab45d65994bcea4bb31f601a23f2aa6659749a813e29c8fab0d3ccabf76a3bc38beb38018dbe4598a6ec88bbb3eb57bdbc5c87
 DIST SmarTagger-0.1.tar.gz 3980 BLAKE2B 7c19153c23419c4c2de914802f5f382e0bebec88dd78828a854d96e1fbcc433bb69bcfe2dbbda9d2048cf7e9af4e601af4199c86748accdb8900d49e09963ed7 SHA512 d2278e3cfe32c37200e6b58c0827b40b9e3163bbe7fd7e5f929acb9c7d5e43ea9de24999b52c43cb7906c7f381606028219e40c8e02613b22b67970d47e3b22e
-EBUILD SmarTagger-0.1-r2.ebuild 579 BLAKE2B 3697c42eb82b91e58b4dc4c8e369b94fa5b5bdb95023661b4d176fd5cd86d7b8fbf3126c81e5e3871d23899fa669535fea2df51172d6c9145ea0f0add446e6ec SHA512 022717c845dc37b09854af3cffc57ad4dfdcebfb7a459517b9f4e3ae7658dfee2a00afe2ffe7287d65cdf921337a001851529fc175b85f07dfaacdc9c6a07102
+EBUILD SmarTagger-0.1-r3.ebuild 578 BLAKE2B e9c37444e377f932049cbae25eceb11237dd94016539067744c7ac38e675d6fd8a75002e55a43ae985abc38c96c0bbd78714e9a551589c4f4342e19ab3c30993 SHA512 bdd3d13c3c510c805182b64fa1e0486f2427a31cb91d863b7dc56bd6c909301ff6aa6a2fe6680c666dc1f9823282f792ce2353b9c497eddde6a54ee0bca06802
 MISC metadata.xml 332 BLAKE2B 2bdb6962be30fbbcdc5ca14e7b815c374eb93db453f32a9f4f0a6ca1cb57c55ae85600efdc89d8124b1f65be3cc5cd8d149a813166f5f4b9f3c20d476e4597d9 SHA512 43ba730573c1647aaf6e52e7e6f5b632d14c9a473911d09449285d56baeb1c00b4be0904400ca0c467d3856f6778dd6b3ebb163dbb4b4cc8a4f2646b74048f25
diff --git a/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild b/media-sound/SmarTagger/SmarTagger-0.1-r3.ebuild
index b8f2b6651fd5..53b370b5c173 100644
--- a/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild
+++ b/media-sound/SmarTagger/SmarTagger-0.1-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Perl script for renaming and tagging mp3s"
 HOMEPAGE="http://freshmeat.net/projects/smartagger/"
@@ -10,7 +10,6 @@ SRC_URI="http://freshmeat.net/redir/smartagger/9680/url_tgz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
 
 RDEPEND="
 	dev-lang/perl
@@ -19,8 +18,8 @@ RDEPEND="
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/smartagger
+	dobin SmarTagger
+	dosym SmarTagger /usr/bin/smartagger
 	dodoc changelog README TODO
 	newdoc album.id3 example.id3
 }
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index a10d6fceffcc..2f20aed26cad 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,9 @@
 DIST abcMIDI-2022.02.13.zip 608999 BLAKE2B 5b98d7cb4a51fbc1afca4a2423bb0904b224740bfb1a966fd540bb0dea546292c5c730b5a586422009ebb3090d3b063aa2e850369c95b789a71b59610c97d50e SHA512 b6f26f06a7dddb54f70c176e51a1ed21d78f96691d26bd6fd9780a098f1a1305325cbfa68b0c80cad2773e608005ac9814118bc93f0bf2a86633e89baa3408aa
 DIST abcMIDI-2022.02.21.zip 609368 BLAKE2B 0608d9539d0a66f739a820693c5a9884d1b39b68e4bcd3d21ce020ef240de6e19eacb52bc35ed7a9d4c4fde47e6265c415cf4d80711853904ccdc1ffd752cefe SHA512 515c6ebef75a5b0592578dab6f5d940ed5e25811dd66f15f85ebb1e6fdd7bcbcffdd4d361e0f16a78144323fac14a0cbd1a7ed6b14c7039e2d48986d40765171
 DIST abcMIDI-2022.03.08.zip 609510 BLAKE2B 231eb517a2d47993ed39e509d377d14ec2311fe49128bf559799ea1fabd3ba79c69307f2d7b9d44fec2279e42d0575141088463ca96aa0f9dda5bbecc305a92b SHA512 3267bcecad586e0aadc5fbc2801c0c992ba765094fdf5d3b71a8634f4433a950c64b0c863bec496bd21f8a630c0e768cbc39d50d58e6cf9d2769a66bf265a8c7
+DIST abcMIDI-2022.03.20.zip 609912 BLAKE2B 8972f6944897d49c1281be9d9b1368278d62fcbfc909651d1fb1347d3efef4ab145f049bac05e11f09118548e9c3c3a753f9367c9e90d933af96e74b71bd6b19 SHA512 138480f0d2a36b573e63a9214d7e2e2109a3e6b55e94999376a333da1978fea0addb5359b0d469d801924d6e039b0eb164a28a9cfad02d73cba1069a29dbfc9b
 EBUILD abcmidi-2022.02.13.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.02.21.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 EBUILD abcmidi-2022.03.08.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.03.20.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.03.20.ebuild b/media-sound/abcmidi/abcmidi-2022.03.20.ebuild
new file mode 100644
index 000000000000..11f547f4cb8e
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2022.03.20.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/alac_decoder/Manifest b/media-sound/alac_decoder/Manifest
index 303422c605ab..28b958068c82 100644
--- a/media-sound/alac_decoder/Manifest
+++ b/media-sound/alac_decoder/Manifest
@@ -1,4 +1,4 @@
 AUX alac_decoder-0.2.0-fix-build-system.patch 437 BLAKE2B c37c4fee08e4b9a1c318b4262807409bf11c7ccd2a9a6aa2a6b48a4439229b68107c7c69200e4e70766639bc6b32fa39166496df7dbb000d8281d38acd07a5e1 SHA512 dc595a8894e98646f437f825f8980dd8aeea15b7a08b5cd38de2fc24b9c8d06815776f9f1d308f66a768e4ba9e6ed66a72fde7bf4d87e368f071dcdf29a89b77
 DIST alac_decoder-0.2.0.tgz 19019 BLAKE2B e227e4a4fe2049c57e3403574719cf59af657a4bc65f262bbe597ec17d1ccb6248cdf89df86a400afae2fb96747af087a5f897f6636ada62217e829c17299bba SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29
-EBUILD alac_decoder-0.2.0-r1.ebuild 568 BLAKE2B 76eecc6ed1c070cd44a45f877a7464e45ea2140c2942e81a6fb4a970f7f026a89b6c3e848320fbedc2eb5a4edaa9b28c5c8e719727a4a6dbbbf928ac84ec890e SHA512 2dafdf84f8eb7976acb6c5711ddd6c5378ab5d4c2809210a52214334d9b99708e3bb0c370f2f6a3bb99d054626ec4a6bbf711cdccce54a8cb7e74d652ef581a7
+EBUILD alac_decoder-0.2.0-r2.ebuild 558 BLAKE2B 3a6ca51f25110834483a3245afa681ff24f947385da4e7904353ff79c352f16081e1f21f1eb22a83fcadc3c856d259ecebc16a47651b1062fc7300697e28c8e7 SHA512 93dd1d38af2fbad825cd8c9d0d92f555e6283125cd4ad0309c8aa5b784dee2c8dfe9119d6c9ff1cf416c42be8c641596f3d2446a05ebda363af31b25f0cee86e
 MISC metadata.xml 509 BLAKE2B f102a71eee1c2014395604694fca7677f13cf3da3ef053891a03914413bd9efa2a94f61a9e8ec639d961cca0848fed938f084c694b2f7307b24227b17cc1f85d SHA512 6d779137a3de42aac8846de568467cd794663a2d4afbdbfd5fd5694421966e5e6a995b3d58bda2a6864a8c72450dd459d19ebc06dcde932aaae06e4de4a3a2c7
diff --git a/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild b/media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
index cb01260fa6f3..765e7d8aefb0 100644
--- a/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
+++ b/media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Basic decoder for Apple Lossless Audio Codec files (ALAC)"
 HOMEPAGE="http://craz.net/programs/itunes/alac.html"
 SRC_URI="http://craz.net/programs/itunes/files/${P}.tgz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/${PN}
 
 PATCHES=( "${FILESDIR}"/${PN}-0.2.0-fix-build-system.patch )
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 00d21b7e7829..f3f3f2ad9d8f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,5 @@
 AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-EBUILD ardour-6.9.ebuild 4836 BLAKE2B 1fdaa1c28f9ec88376bae1aa56151c4dae0468ceea768f6e997dcc4159efc32a3dad9a55a4fa22282e148250eeaae0d7f04c149fd707006d8f5e488e8a20d90e SHA512 ab89ff4ba9ae443cd3e2b0a67eb4cb6fadc24ab8fdfc38b949e65b40b756236a710c68394f4ac2a427a2e8c2f97c2fccc867086373e95bd633eb580c0dd170bc
-EBUILD ardour-9999.ebuild 5001 BLAKE2B d88526f2a49f2d50716ec593bd6496af4879d842e402f6286550e9693f69761188d4c0c76d990708eb19017fb610e73e4886639641e246c550c3d79e6867bef4 SHA512 5275acb7f0ff0575da68d788283bd3580e42066b40b163f522a68f81209931db2260c04f65fc6f1d0e3a91a751b21bf9a05cd06ce18da24ebb4af91b3c1f0349
+EBUILD ardour-6.9-r1.ebuild 4806 BLAKE2B fd8f17a0c98f99f5e09436e432ba0161e53bd1cf72f684e43d02bc7207b08d71b372c476e501e35c7ea6eef4f236f3b4366cf4e274c32119e3b8320ec627524f SHA512 69626174efa7c1712c9e04bfaf3455ec173891ada40ad6af40ecbed4e7b67261b6c42357e96008e561ff2e9bfc80139b87935627577bdd91426ea0ed88dc39bd
+EBUILD ardour-9999.ebuild 4971 BLAKE2B 47971c41635208d1bc7d9e7675fc0ad97521aed9c3d8ff8b6039fbb49ed6a65aa06b6a00a7a01843f299871d5f21062b16f27c8d3fbaef1aaa57d2c29c48c3f4 SHA512 798d1ee8bfc0515491434d7e68e89552547d1156e7589e1356a4194e7d5df8c7d7ab400029a5841c7438993fb823f7374bb2739b6e6b05feb1ea21c17b2f96e8
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9-r1.ebuild
index db6b4df64dd7..95a824b4d2d7 100644
--- a/media-sound/ardour/ardour-6.9.ebuild
+++ b/media-sound/ardour/ardour-6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,6 @@ IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_
 RDEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/libsigc++:2
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index d4f641297a64..4b3a74958f62 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,6 @@ IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_
 RDEPEND="
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/libsigc++:2
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index c74c45661ff1..8aa4900a2bb1 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,5 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 941 BLAKE2B 64ef7342c0c07ca573efb7e7142854a4d366494983b400af484d9c0354cc662d1090bf6396e4955634ab2e1c9864a5011a8dcc6fe1213c02d4491cd9b57fb729 SHA512 3bb7cb3fa04863c2a4debf5eade64233d3d3ce38272f2d73d14d1772895c5f88ec415b1c22aa3b077204d4569a24ad25c6ca757e2c6a4df31e9fe48eea9c9fdc
 DIST chuck-1.4.1.0.tgz 14902696 BLAKE2B df324c793236fccc26f6604d1120dc1777cb2ffd8c95a8eff42e8963b9e7011aa88fb094145b4845821c39be781d77ac163cb02025db4fd6db7972f3c390fe65 SHA512 8967c1279959b6a41759519eace468fa4384cd0511c365cef91f8c03e8d720407637c2f9f33df6abd246b7c2155005e82d206113c90a4f23fb22b02f6f426704
-EBUILD chuck-1.4.1.0.ebuild 1831 BLAKE2B 913b35f2727d5f5f728bd35ad2ca414df4c364b6f3963dc67e2170433aaa3160c31c71d42da6b138a743c537fbb53f95394b14e4ed9a4dff1d69d7054dde88e4 SHA512 fec380d7c388988e382884b713ea32f6c007885cd7c1203a06ca64490e7d0ea8482e9b609387e7719ac4b8dcc1ffc6b7e07f9d53426aaa3379a3f493b570c364
+EBUILD chuck-1.4.1.0.ebuild 1835 BLAKE2B 477d5eae651ec50425a7d4e07e769e0b5b613c791909c4462c9fffbf9c7b934c514020b1983b1707b6d8974a09f0733cf4a65d747ad5e780c5518b1dc90d2095 SHA512 21d67c25fa5644c320098406f6d32efadf7ca02154a6f8dc2256cb8fe46ad70e77f34f9e2206c61a4f7e996afc658c8d25691d0acf0224871e8b3ae427ed0808
 MISC metadata.xml 968 BLAKE2B 5f7c72834133fedc3ffb54f563dc80552668484628029f8d205444cd69f89f91081ed6a71aae4d542dae09bcfc729ad88c6701df450313275e6d1c1f522fd7a6 SHA512 c548e0d3c701497e696626f46c010aea9a90bb1b52bd5f2e1ebe0f4189b171dc21c0848b90a6a23cc44ae2ba5e98d8671529fe6b14c957ad73202191c2915c0f
diff --git a/media-sound/chuck/chuck-1.4.1.0.ebuild b/media-sound/chuck/chuck-1.4.1.0.ebuild
index 7bfdf97b999c..21730ecc4a19 100644
--- a/media-sound/chuck/chuck-1.4.1.0.ebuild
+++ b/media-sound/chuck/chuck-1.4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ compile_backend() {
 	backend=$1
 	pushd "${S}/src" &>/dev/null || die
 	einfo "Compiling against ${backend}"
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" linux-${backend}
 	mv chuck{,-${backend}} || die
 	emake clean
 	popd &>/dev/null || die
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
index 8be3c217c535..ccde082470f0 100644
--- a/media-sound/cmix/Manifest
+++ b/media-sound/cmix/Manifest
@@ -1,4 +1,4 @@
 AUX cmix-1.6-ldflags.patch 224 BLAKE2B 1775b4d0ffe31f25796e56a926b71f55b0e64401754838e290779597ed8eb59b7e9550242fcf78d8d9a07351d438bb63f48da7ad30f0b93209506f03eafbffc8 SHA512 455ad21708986a8279da22f4c1008796e95c96a850e4138c352f965a730ff1bdd73e4a4396d7678574492727e5e4dcc1ecb445c8618ef2aab3d089c593170862
 DIST cmix-1.6.tbz2 12880 BLAKE2B 1d024279a30439099dbc1f7a4c7a98f96143b716f032f57bb662d901e3fb92977333cc6ca1743727128c08ec92f3ef01c57b37e7bf803f8525c05910eed9da0c SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38
-EBUILD cmix-1.6.ebuild 547 BLAKE2B ab4e1d8d89902a2e5d14c027a6b8ed3c37daad4827f04a020305797f9e236cc4cc482d0ad74202957853f8ecd2123e9b811ed546a5ca5a69907697e4f98b9b59 SHA512 8efe5eeb83a3f6a309765c39c6ed809170c1a55d44367d74e2aa707ab91634499032789efcdaa58872d42a89c8d0f2c4bc3543f837e5c1f3f57f2aa1ef96c07a
+EBUILD cmix-1.6-r1.ebuild 544 BLAKE2B 0fdc77987919090041b6c197db836e41ed98eb96c8652b5e6b1bb3402851b94b24b9ba2ca74994f12d14375c60019149d95294eea105edc69e4584c5d719999a SHA512 0cb5425e56ce08d2f361dc7c01fde3ff1db4fe8fbbdafa14866d4c2413d5582451f290538ab964996f60b537b602a91009066c81e786ccd0619c5f4e572f6ca7
 MISC metadata.xml 328 BLAKE2B 1899d14fa795bc922825b1f32d7a72221d77d81cda508bdb61c9c91e96ca657104317a49135656aaf4499751f914b621c34116d01eb7ff34cdcaee05aa37d394 SHA512 c3b72c49d280fd72f5a5a948ef290734f884daf4fc6d0b50703c0cf70cd4946bc25ded2e4f948fa401a28672c23173363c49a742e8241c7e4806b3d82ea38efd
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6-r1.ebuild
index 1dc7e4ab02a2..91ce5c26b941 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/media-sound/dagrab/Manifest b/media-sound/dagrab/Manifest
index 432d56e8f229..d3aa809ae624 100644
--- a/media-sound/dagrab/Manifest
+++ b/media-sound/dagrab/Manifest
@@ -1,5 +1,7 @@
-AUX dagrab-0.513-build.patch 1207 BLAKE2B 737937b71be7eca2cabd90e6e77595032389e4580e8258f247ca561cc7964bc462f6415a8b766121d275df90d2bad5e1aca5f6f96d35457c9fea1917136c4d24 SHA512 f86f59d3877551162505ea0d15e5f90248aee45f6217771143b2809a650d720a203a147f7d8ebbad52902b61054b6786f51b85c98dd4c5d8e2df812e7011e537
+AUX dagrab-0.513-C99-inline.patch 599 BLAKE2B dd593062ab831130ff0942e6a53fd460a3d433be57b7b32cd4cc5962cb885ccf99238a5148b6220d662b4aa73e1f51e21b1383ea964a142698996f5929403365 SHA512 d2c6747e64c13c718e9d457bf2e25ca1447e8875a40f0713734cad74a4159fcbeace250e8beb71625c76c505363f6853e2ba8420c0f54860b1644c458ba7fc7b
+AUX dagrab-0.513-build.patch 1381 BLAKE2B 936da275c3593ac6337b95f6736807cd65200f3fbaff3cc0172dbf551e7efb0c5fd145a322e25d5c05bc819e5c2372a84670007b90cbf2d6f333787619f38cb6 SHA512 dd8071c6135f703908fa2fe67c4a4519dc65452faa61bccb4e7082d60863d9ab483cc5a5e159d1b965afbe275eac60a8667715168e42dfa3e3be430593b6d8f9
+AUX dagrab-0.513-fd_set.patch 180 BLAKE2B 75eaea68b558444dbfad0e230f11b0b54f59f927c810f1e036e10a35131c205536cfe758a00765dde40fc904e5fca6a2b01b806a53cdc605c4a3121a53296e81 SHA512 731d950af742bab0bf3f244419f17bacccef65f641a1383b94b25f69071c0eaa02ffc59cfa03f839c90b78dc9a8dc59508a86545419690661131c98ad090cf2f
 AUX dagrab-0.513-freedb.patch 716 BLAKE2B 72965ea27ba42422d207f8949d2730a47732a4882193c5eec7a9b6f9a567151961c33556dde82a15b1786a9fdb6fd19c060b950899f57ede191a20ee62d65e83 SHA512 5516bb2db854fef1c371f8f96213055ec24086ec773e2b8e1f12c8ca9ce87d2b43b3575112763e7bcf401e029dee47386c244f61bbc675ec3ad64c5f7788a0fe
 DIST dagrab-S0.513.tgz 38747 BLAKE2B 42019cf9ba49fa6bf94f143f7ffd2e3d67f105b9ec53a7eb77edb6e69fc323d1a02aa1a713d349ad47bce62985c06231eda0b272ac01ea87532355f5e5f1518e SHA512 196a9b0282715bc28dc68b56cf04370369a6403c8178fd943dd3e029c91c6ecc67f7500a4be2b3277e10e9af06a39cb701bbe76cc57e4f97732e0d53d7c9efa7
-EBUILD dagrab-0.513-r1.ebuild 652 BLAKE2B ff0cdc006e1bedb5c547dd0981cbddbc7972cc9ceb0f2012efa900f90a194750ae26a2ca0922e98970e50ba94ba0e984d550aaf18cae15abc3dfdf85909cae07 SHA512 429163b9a053b684e36da274b6566c5d1e96a524467ed810a3b7cb130a649b6208cf3188412f57e2963d7abcc8a2421b514386a1e61de34fc16b39598dbcfb26
+EBUILD dagrab-0.513-r2.ebuild 652 BLAKE2B 87c44ead11469f1e983cc82494c0c8b2cef29f0edab84442e94a1bbdee6f29be110c2797faddbf77eca705007b55bb46ea62d01e70cf951a4a6c4932231821d2 SHA512 31b8071596a405e22ad1658e0856e28c68210d2db9dcebcb518b650b8b37fe2fe60881867cfc0c03be52cbfb32c5421f7d81ae05ccefb7b88a590955ab515016
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r2.ebuild
index e288a0d2df40..3ffa49eab889 100644
--- a/media-sound/dagrab/dagrab-0.513-r1.ebuild
+++ b/media-sound/dagrab/dagrab-0.513-r2.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic
+inherit toolchain-funcs
 
 MY_P="${PN}-S${PV}"
+
 DESCRIPTION="fixed point cd ripper"
 HOMEPAGE="http://vertigo.fme.vutbr.cz/~stibor/dagrab.html"
 SRC_URI="http://ashtray.jz.gts.cz/~smsti/archiv/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-freedb.patch"
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-freedb.patch
+	"${FILESDIR}"/${P}-C99-inline.patch
+	"${FILESDIR}"/${P}-fd_set.patch
 )
 
-src_prepare() {
-	# fix #570732 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	default
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin dagrab
+
 	dodoc BUGS CHANGES FAQ grab TODO
 	doman dagrab.1
 }
diff --git a/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch b/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch
new file mode 100644
index 000000000000..fa5e0793e4d9
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-C99-inline.patch
@@ -0,0 +1,30 @@
+--- a/dagrab.c
++++ b/dagrab.c
+@@ -416,7 +416,7 @@
+ 	return 0;
+ }
+ 
+-inline void cd_track_name(char *name, cd_trk_list * tl, int tn,
++void cd_track_name(char *name, cd_trk_list * tl, int tn,
+ 			  char *trackname)
+ {
+ 	if (opt_cddb)
+--- a/err.c
++++ b/err.c
+@@ -35,7 +35,7 @@
+ "\n%s: error writing wave file %s\n"			/* ERR_WRITING */
+ };
+ 
+-inline void die(int n, char *p)
++void die(int n, char *p)
+ {
+ 	fprintf(stderr, errs[n], PROGNAME, p);
+ 	exit(1);
+--- a/err.h
++++ b/err.h
+@@ -6,4 +6,4 @@
+ #define ERR_CHMOD	5
+ #define ERR_WRITING	6
+ 
+-inline void die(int n, char *p);
++void die(int n, char *p);
diff --git a/media-sound/dagrab/files/dagrab-0.513-build.patch b/media-sound/dagrab/files/dagrab-0.513-build.patch
index 43408d56b374..1c85aecd0986 100644
--- a/media-sound/dagrab/files/dagrab-0.513-build.patch
+++ b/media-sound/dagrab/files/dagrab-0.513-build.patch
@@ -1,5 +1,5 @@
---- dagrab-S0.513/dagrab.c
-+++ dagrab-S0.513/dagrab.c
+--- a/dagrab.c
++++ b/dagrab.c
 @@ -776,6 +776,7 @@
  		thread_save(NULL);
  #endif
@@ -8,8 +8,8 @@
  	}
  	/****************************************************************
  	 * Close output file 						*
---- dagrab-S0.513/jit_in.c
-+++ dagrab-S0.513/jit_in.c
+--- a/jit_in.c
++++ b/jit_in.c
 @@ -74,5 +74,6 @@
  			*p = (*(p + SSIZE) + *(p - SSIZE)) / 2;
  			view_status(ID_JITTER, NULL);
@@ -17,9 +17,9 @@
 +			;
  		}
  }
---- dagrab-S0.513/Makefile
-+++ dagrab-S0.513/Makefile
-@@ -3,14 +3,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,23 +3,15 @@
  # Note: PTHREAD support is optional, you can comment it out
  ################################################################################
  
@@ -31,20 +31,26 @@
 -ifneq ($(wildcard /usr/include/linux/ucdrom.h),)
 -       CFLAGS +=-DUSE_UCDROM
 -endif
-+CC ?= gcc
-+CFLAGS ?= -O
 +CFLAGS += -W -Wall -DPTHREAD
-+LDFLAGS ?= -O
 +LIBS = -lpthread
  
  all:	dagrab
  
-@@ -28,7 +26,7 @@
+ SOURCES=cddb.c dagrab.c jitter.c jit_in.c print.c err.c
+ OBJ= 	$(SOURCES:.c=.o)
+ 
+-%.o:	%.c
+-	$(CC) $(CFLAGS) -c $< -o $@
+-
+ cddb.o:		main.h const.h version.h dagrab.h
+ dagrab.o:	main.h const.h jit_in.h jitter.h cddb.h print.h err.c Makefile
+ jitter.o:	main.h dagrab.h print.h const.h
+@@ -28,7 +20,7 @@
  err.o:		dagrab.h main.h
  
  dagrab:	$(OBJ) Makefile
 -	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab
++	$(CC) $(CFLAGS) $(LDFLAGS) -o dagrab $(OBJ) $(LIBS)
  
  clean:
  	rm -f dagrab *.o *.wav *.mp[23] *.ogg .*swp *~ gmon.out tags
diff --git a/media-sound/dagrab/files/dagrab-0.513-fd_set.patch b/media-sound/dagrab/files/dagrab-0.513-fd_set.patch
new file mode 100644
index 000000000000..2b039f5c6b31
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-fd_set.patch
@@ -0,0 +1,10 @@
+--- a/cddb.c
++++ b/cddb.c
+@@ -29,6 +29,7 @@
+ 
+ #include <netdb.h>
+ #include <netinet/in.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <pwd.h>
+ #include <dirent.h>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index b039de4a03ac..04d94a239d69 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,3 +1,5 @@
 DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
+DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
 EBUILD denemo-2.5.0-r1.ebuild 3013 BLAKE2B 4b9ebe4683231ea9413273cd90b0d5d2e6bd83c0a64d1424105e5040a73edc0438222989e6efcebe2b5b91d876f24513129cadcb2e3885851ad82cba05b9a45f SHA512 83802cb91d236f0a2d032adff6dbd43f5602a3c0421f5284e5d3322cd0bb5c9daeae710bdaec8b20779aa490e433432d50c2981981d696a19d139cb65940dd13
+EBUILD denemo-2.6.0.ebuild 3164 BLAKE2B a79254a51b17dbabe95a94fab8bd61f15c16a550ac38e52f24a7840521c78fe6c1d242a07c270f3d7b09cbeed2b06fb4c3b327ac9bbc0a63eef30ed0e13a7606 SHA512 6954d4c5bd47a30c23c2d8544c5db8b9f4fefef2b2a853f0921a598be36d331c80c7e6b019b6d7cb5f05d8b4e5d34dc6fab086dcc556eeb373cfd1f1241bf6ed
 MISC metadata.xml 1305 BLAKE2B b6e58a60c832879cfe3fa5d8fe3af73fdcc698b43b139e1063f20170d051023a00c076d7b618fbc04eb88b4ea113cab5ab97d68df39d6a56a2d81b5490ddfdcd SHA512 301c335b2abd0abadfec0c9ca4904fd3e56ab71b1abb84b632e81591485ad9cabf8c5abcb68f4e106ee4e9f2769737f0d1ab67d7fe0331e83f96897c08f840bd
diff --git a/media-sound/denemo/denemo-2.6.0.ebuild b/media-sound/denemo/denemo-2.6.0.ebuild
new file mode 100644
index 000000000000..aebe91410942
--- /dev/null
+++ b/media-sound/denemo/denemo-2.6.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eapi8-dosym font xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+# fluidsynth currently broken. See https://savannah.gnu.org/bugs/index.php?62202
+IUSE="alsa +aubio debug jack gtk-doc nls +portaudio +portmidi
+	+rubberband test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/evince-3.22.1-r1:=
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-2:12=
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/fluidsynth-1.1.6-r1:=
+	>=media-sound/lilypond-2.19.54
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0=
+	x11-libs/pango
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( >=media-libs/portmidi-217-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.25-r1
+	>=dev-util/intltool-0.51.0-r1
+	>=sys-devel/flex-2.6.1
+	virtual/pkgconfig
+	virtual/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/org.denemo.Denemo.desktop || die
+	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
+		-i Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-gtk2
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--disable-static
+		--enable-evince
+		--enable-fluidsynth
+		--enable-gtk3
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		$(use_enable debug)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym8 -r /usr/share/denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 14e53628afa4..44ce73cee4cc 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
 DIST din-53.1.tar.gz 3708022 BLAKE2B 882d4ae6cbe24c3d7fc326df3f3630d7ea7cd65b5d53c4751844dc3edcf9d533cd7cfe58fed4c46766fab6b4983e75f75145206b5362bceb27382d02705b9a36 SHA512 42058b00402e726869af8a5cb8eb9b34e7b1709185c972d3f3b633a980ad7de57a143ca0ce854ce681ec67b81cd6dd2b2b06023a15d3f1b1bd54c4ac643b6096
-DIST din-53.tar.gz 3707794 BLAKE2B f1631c4b923a5f737181120c2a20dd4079e31b9fe02552a9895cab0f0913b2e4d8185404611795e9379178755168c1975c7520b0ae549708f4916a67631b922c SHA512 b359eb84085be80c13f5cf2a5af0c15903778fec677f91c9aa9029849df39d4bda95e537d7f85f290a8bb38932ef0da35c240921154788b5e89e347d7ac90a7e
-EBUILD din-53.1.ebuild 1089 BLAKE2B f13e0c8b3c0e02ffb6817e2da3b32e4c4d3de3c3e59db322659c32f3db94bce061f8f3b9aa8fa9c2eea234e321ef6bb7c3dafc74b3449f2c11ac5250813b1f78 SHA512 1f12458f2a2801c61a00069e32071c27e1b1331ce5e9ac1fad9fb46fa6eaf36a9cc89ed5f2d25489c06eab896e7f6ba7b24bb4c2e65b57c261bd2d1b2e951315
-EBUILD din-53.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
+EBUILD din-53.1.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-53.1.ebuild b/media-sound/din/din-53.1.ebuild
index 1ff40dd5f7de..a12ad9ed2cc6 100644
--- a/media-sound/din/din-53.1.ebuild
+++ b/media-sound/din/din-53.1.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="
diff --git a/media-sound/din/din-53.ebuild b/media-sound/din/din-53.ebuild
deleted file mode 100644
index a12ad9ed2cc6..000000000000
--- a/media-sound/din/din-53.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}-52-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/drumstick/Manifest b/media-sound/drumstick/Manifest
index 3eea3d687733..2eeb2d636e40 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,3 @@
-DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
 DIST drumstick-2.5.1.tar.gz 1917814 BLAKE2B b4e9957288a05cf74347e39d05a638a26abb72b1dbbda856ad81e7dab87069e9bd4d57ff9eadece1673c0cd5fc9e9149bc4c9a06ff1fadef77c1ad38fc58d24f SHA512 9dba509bb5ef519f78251787a7a2607cf1cee0255d74ab1f6707a0611abbf8963e51b2114d41d347e55d293336e2ca34d9e2b5ac7989fcfe24e355392bae024a
-EBUILD drumstick-2.5.0.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
-EBUILD drumstick-2.5.1.ebuild 1281 BLAKE2B 78089f7deaf51b1aafbbfb2c68194a7190f68e27d9d247b5213edd77d777ee30862dca284380400e6d0d0129e375301c242c32410584dea9ff3b2a66cd2432f6 SHA512 27adaff70d81701478b6c997812fe3cad3cb8606dda584f7182e8f0313883b31c597ccb6b1f1b14899cd4d7b9f5d2015dfc33898e145e5185fd829e071866749
+EBUILD drumstick-2.5.1.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.5.0.ebuild b/media-sound/drumstick/drumstick-2.5.0.ebuild
deleted file mode 100644
index 29329502f5d2..000000000000
--- a/media-sound/drumstick/drumstick-2.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="https://drumstick.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth network pulseaudio"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-libs/libxslt
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/docbook-xsl-stylesheets
-	)
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( dev-qt/qtnetwork:5 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DUSE_DBUS=ON
-		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
-		-DUSE_NETWORK=$(usex network)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_DOCS=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/drumstick/drumstick-2.5.1.ebuild b/media-sound/drumstick/drumstick-2.5.1.ebuild
index 818e06285dc5..29329502f5d2 100644
--- a/media-sound/drumstick/drumstick-2.5.1.ebuild
+++ b/media-sound/drumstick/drumstick-2.5.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 network pulseaudio"
 
 RESTRICT="test"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index c6d6dba450c1..1409913e26d2 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1,5 @@
 DIST fluidsynth-2.2.5.tar.gz 1747610 BLAKE2B a658e5fb66ebb091560d9e0b8bddd99ec7e7e84c58d9074057fd612a2eb0abf637778ea06c3481dd4d5179a917d47a08f25533d9002c1a915037a83279e2381a SHA512 9ba96da560d3e0a3e38febc6f10d2b3d8019b63ffa0a4c6fa9032efd019333df0367bdd3056faba22517f59f4ef27b18d52429606ed2b8306f69778fd755beb2
+DIST fluidsynth-2.2.6.tar.gz 1749202 BLAKE2B 5296d48809a457770a968fb9ae20ae4091bbae11d6fbf8a11f75e44de1ca9fa1c121e925e61f25ab1016907ced73364ff632ffa3e7edfa9d15019bf3f3e0bb3c SHA512 e4958c409e057fe6e09a0aa86cc0d7c939aa883de479aa90c43f19faa4d0c3a0f6aca7242fad11ec7a7776cb7e2e602c953c6249fc94b9f04425101584ae3e6c
 EBUILD fluidsynth-2.2.5.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
+EBUILD fluidsynth-2.2.6.ebuild 3418 BLAKE2B d06ccfb0efd1626bf3ad273d7b743fc549a1a4d7d8f1bfb24dfbb303e2141370510d9326b34912995bd5604c4824fb7293919e98faeae7a57af69caf29e731c1 SHA512 c401e9ab73e94457be436e4adf6a0c438000743da19a57e299e5e6844ec1bea8ef294f9a4428186601b5c1b33be9b245d0a851055d4d41f1699d3a1214026ee2
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
new file mode 100644
index 000000000000..51908c546139
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd toolchain-funcs
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/id3/Manifest b/media-sound/id3/Manifest
index 3e24f3ff1689..4c44fa735518 100644
--- a/media-sound/id3/Manifest
+++ b/media-sound/id3/Manifest
@@ -1,3 +1,4 @@
+AUX id3-0.15-makefile.patch 564 BLAKE2B 3ea20d0fb544ab8df6a836e65011f42ea72b6f6a8d5272a63e410ef461ac87e83f71de92c12ec30f6701604ea1128b983b30c9f54a21b2df59dddcccf2d0942e SHA512 971911d0fbb3a7022c77a778520af132ab3223bc2f3878b86fa4ef6aeebf452b667abd5587e3dcfb39e121207df321dbf128182eeb73a613779f82ab93ae06fb
 DIST id3-0.15.tar.gz 12871 BLAKE2B 4d4b8edfbebdb79b0528817f183a76ef05f7e4f051f366bcc327e9481e39eca422cc221f4d272dea57d184089e696aeeab722839e1c2cbb6e3664656161fc0bc SHA512 b99f3608fc5494863ddf71b5d15505ea952453777090deb82ea469c1c8ed8cc794907d2fffcd4c5a0aaf6ede260103cd9e720e06244877934b22dfa88e1f2cd0
-EBUILD id3-0.15-r1.ebuild 544 BLAKE2B 3329999014ca3fb41cc7b2f80f37672a81448e5f90eb95e026db8ae21858da813789f7eb50c4d0d78be704c0000793885e3733227f7413f20c5e7f6135e93bdf SHA512 a4d2c000f97034a4229a6caa397f1d562a2daa57986954290be8e6f70299ce0f4e1f286f6ac0d54071a9bf05f295b190fdacffc96fad48523505ac782b485a35
+EBUILD id3-0.15-r2.ebuild 454 BLAKE2B 1ceb6e8f1d7e018a7ca84de9a18bbd68a53394c3dcb30abbc9dfcdd7e26fb1b48b8ec640cace381209612e5438e814ba7e5e598015193c6a4cf5842dffe741d8 SHA512 d794ad2022a328247ec2bd968935b84c75d94f30c02f6c235a7692a9ccf79b117ff12d9dc24aefd326892f5c0491a2a9d67ff4d37667d79bcd7bc8356bcf903c
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/id3/files/id3-0.15-makefile.patch b/media-sound/id3/files/id3-0.15-makefile.patch
new file mode 100644
index 000000000000..265fa0970269
--- /dev/null
+++ b/media-sound/id3/files/id3-0.15-makefile.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,9 +3,6 @@
+ 
+ SHELL = /bin/sh
+ 
+-CC = gcc
+-CFLAGS = -g -O2
+-LDFLAGS = 
+ LIBS = 
+ DEFS =  
+ INSTALL = /usr/bin/install -c
+@@ -20,11 +17,6 @@
+ SRCS = id3.c
+ OBJS = $(SRCS:.c=.o)
+ 
+-.SUFFIXES: .c .o
+-
+-.c.o:
+-	$(CC) $(DEFS) $(CFLAGS) -c $<
+-
+ all: $(PRODUCT)
+ 
+ $(PRODUCT): $(OBJS)
+@@ -35,6 +27,6 @@
+ 
+ install: $(PRODUCT)
+ 	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -s -m 755 -o 0 $(PRODUCT) $(bindir)
++	$(INSTALL) -m 755 -o 0 $(PRODUCT) $(bindir)
+ 	$(INSTALL) -d -m 755 $(mandir)
+ 	$(INSTALL) -m 644 -o 0 $(PRODUCT).1 $(mandir)
diff --git a/media-sound/id3/id3-0.15-r1.ebuild b/media-sound/id3/id3-0.15-r2.ebuild
index 3cdb64eae22d..27233f54fba6 100644
--- a/media-sound/id3/id3-0.15-r1.ebuild
+++ b/media-sound/id3/id3-0.15-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,14 +12,9 @@ SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
 
-src_prepare() {
-	default
-	sed -i -e "s:-s::" Makefile || die "sed failed"
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
diff --git a/media-sound/podget/Manifest b/media-sound/podget/Manifest
index e9deb380f8c7..f99f7cf5723d 100644
--- a/media-sound/podget/Manifest
+++ b/media-sound/podget/Manifest
@@ -1,3 +1,3 @@
 DIST podget-0.8.2.tar.gz 66786 BLAKE2B 855d872df0dc07c43f9766b9e736da217a5303a963088b3414385fb055a45fa3f00e86d6f9b39fc4ea1c77b4882962666c34cb704acec5c115b6c4f9382d8210 SHA512 4e61b4d0197976b755f07445a371368cdc090e148c378b86b925ec1d23e447a4d66d9cc68c2fc8431246bc016d44161340bdb30195481d01d8fb00cf142fa696
-EBUILD podget-0.8.2.ebuild 627 BLAKE2B 95080338636223a5fb1d593d32c3e7f599a6338dadea4929f0c10ea4e4021b7f35932858c309bab4801ee579ea745bd38e3f486c0a88fc62275e0f0e480fe5db SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3
+EBUILD podget-0.8.2-r1.ebuild 617 BLAKE2B efdfc12a355fa9d173a3648bc2fd40e9f2c6ebb254b44c887ae55bf05e7edd2d93054a888fbf892364696ed5f7955269b2d0ecf349173e9fd1dcb27881645f99 SHA512 3a4a7647c71a2d44e12ac67f76dcace6ea9a28153c63d242cd4fb0ce97f9f7da1c684def44df201988c8d67747aa3bc8a8b83dde5d44ed25ed884be55d347ff3
 MISC metadata.xml 527 BLAKE2B e629308e97acfba4198e3c0dda2e86d3f2052c26f215292d32017fab884d8a65c6e61cb80ee500cdfad6ab7178f5bbc97017b0110e2c0e8b3954902c8c56db1f SHA512 6d527fb76148ffa7f8f51c0ca35063d2017728629aff4a350a0a826f14793cac07533d4d8a489d2729e8eabc482447cb0bcf985f7d45e7cdfad1f2c921b5c0b1
diff --git a/media-sound/podget/podget-0.8.2.ebuild b/media-sound/podget/podget-0.8.2-r1.ebuild
index a2eb5f346793..1c3aa569c2f0 100644
--- a/media-sound/podget/podget-0.8.2.ebuild
+++ b/media-sound/podget/podget-0.8.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
 HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
@@ -10,14 +10,11 @@ SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 RDEPEND="
+	app-shells/bash
 	net-misc/wget
-	virtual/libiconv
-"
-
-DOCS=( README Changelog )
+	virtual/libiconv"
 
 src_compile() {
 	# There is a Makefile that we don't want to use.
@@ -25,7 +22,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${PN}
-	doman DOC/${PN}.7
-	einstalldocs
+	dobin podget
+	doman DOC/podget.7
+	dodoc README Changelog
 }
diff --git a/media-sound/ptabtools/Manifest b/media-sound/ptabtools/Manifest
index ca743cdd7daf..dbfabe087fe1 100644
--- a/media-sound/ptabtools/Manifest
+++ b/media-sound/ptabtools/Manifest
@@ -1,4 +1,4 @@
 AUX ptabtools-0.5.0-makefile.patch 778 BLAKE2B c921d0e5c6a5a38119d0c984dd5208d069c59855da9b1ab7cabdfcd8e251bf989137f420d9b91c61240d81f28ff1fef18c0b68848e2e2c02a59696b8ce80c34a SHA512 d68a8791e3ec053ed557db0dce4de6bf07e91017e416a11cb131a5786ef66957cf2ea955a77fd8d009ab6d5b20ed6b044abe805994f4342a00fe84a3392f0dab
 DIST ptabtools-0.5.0.tar.gz 116083 BLAKE2B bdf1c39ca94d445f3488fd67eaf343c44d7924f22f1de3adaa06fcf8af3b188beb599518c718169e664b28ae2c9c10f31246c3b620671e0b0a953da161022c50 SHA512 c0028daec1587b190692b8aa8d9002063022ff7516d99e9fae3fd01f25d27ce4230cb2b15ecf4652fd4b902de27bd8ae4b63af248e950ac8e7c1f277da37cc93
-EBUILD ptabtools-0.5.0.ebuild 877 BLAKE2B bf5919b99e2ccd24f6444780f6b56535a11a1072507a4ff58b5cd0f1d61438af44c9f9d93a1d4306777c01075045a20cdd6689be2aefed7064234dbf609f4204 SHA512 a520b6655be6c083667fcc976dd45d10b025fd01f607de5fe40173f11282f17b0f4305c30c37fd198949184f63e683bc6437af4bd1dc73f0db2ee99827f71094
+EBUILD ptabtools-0.5.0.ebuild 879 BLAKE2B 5e941065f318fcfaf17c047c8ae56d334ec85170de52ad735ed464d566612bf7d3c35966a34bf7365234979e5b493f9ac37209662e94d985ccf5da2d67b7352b SHA512 4db5b6e9842d3ce044de73f5655e4e6d038efd861661fa34219613ff977c49553781ee96f89b1f76e8ae30ff8de5830ebb553746c840f1d87052381e5177d9b5
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/ptabtools/ptabtools-0.5.0.ebuild b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
index 55e4bca6c2ea..15641a2b9e4c 100644
--- a/media-sound/ptabtools/ptabtools-0.5.0.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index faf428b72ce0..81e5791f42e7 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r4.ebuild 1217 BLAKE2B 53483168d478bcbbfc49ab4157d457ddf38f01c73439d096a76a1330a9c9a00c178f71cdb90728a6a227b4c5c7c37d24c18c5fdfbf1a86a073685ac588873191 SHA512 ee6d8d6b95133f4ba46a17b1127c6acf09ed882dbcf60309c2eea5e97d129d3fc107d263d057058ca5895bf06c0f0b58d694b26e76f719c7a90f080a6ad20ef4
+EBUILD rplay-3.3.2-r4.ebuild 1224 BLAKE2B 29040b939ed1d147a37c17900da3fcfb8a5f96b3ad01db735dd15013d55764f77d894c5bf327a3ad63fcd0f649707ad449bfc5b6d9790e12eea0fe2f750a4b2a SHA512 b5b8a786ff2c6d50010b77ff2cd476194527a0c41105a164facb17ad829142774e7bbe7b1345c0c0aef4eb2f4c77a349243bdb47b901a9c94806125b8f844b86
 MISC metadata.xml 603 BLAKE2B fe0c2b4c56d15c934cd432b739ed11f6e69aa6fdc39c591cc8b5fe1d7eaa122d756f796754d0f093e22a8bc89024c4e5bbe85c8159f184f8e590d1ee676a2539 SHA512 addbc1a2be33ee6f93530c86d22376586830a04d2d52c3e673e6c4a88d0aad8b579700faa2829dfdd3f5fb153519a5bcd5f7592eb28574089c86c4e8b9654788
diff --git a/media-sound/rplay/rplay-3.3.2-r4.ebuild b/media-sound/rplay/rplay-3.3.2-r4.ebuild
index 0cbf1cbc4a6d..14af27da6c3d 100644
--- a/media-sound/rplay/rplay-3.3.2-r4.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	acct-group/rplayd
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 50cac4319c9b..fe9ce1e68fb5 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,5 +1,5 @@
 AUX sndpeek-1.4-gcc.patch 315 BLAKE2B 782db101136b691904424dea1d72c02a4308ce99018868d6831be978029be4a51ace611f41e36e91b2f70add83c3269722e1a5061e7fb267a63cce5772f3b1b1 SHA512 184f4e39b033aed7f7ce49e5e15ee2bda016bc56b0f5fba05ab52a13f40e0c957a0a8c2754f0437b782556de9d0a5bb2a3694bb107261b4c80fda07a4b228d18
 AUX sndpeek-1.41-makefile.patch 8410 BLAKE2B 13df444073c55efac49ea862957375b2284567134bf1313069e4b41254232440b6e7f83c25e79cfc62611caa0a215cc56d14f130a5bfa2d8b4ded307860ba3cb SHA512 9999454775686174bb9561eefb0150cd7031ed2faad26c5830a367e21a844aee62dd0ced65cb17a7cd063f45cc05c6824f3abc5d427ad3ba2c8b5c0efb5de71a
 DIST sndpeek-1.41.tgz 312196 BLAKE2B a86f9bca8930bb555614a19ae63d8336e8718aef2a9b1ad297b4a16282a37f6b7608e6cec889719915a0fccdf0e9b26d7c9703585f820599f121905a2e85f28a SHA512 b0d352332d80d89412cb9aa3507f1505e9c4bf29b327106ec758e71eb23db59395f41ecdbf5a55b3bcd4b1f6cf18766bdb294d78da9499717e65e48cff710465
-EBUILD sndpeek-1.41-r1.ebuild 1592 BLAKE2B 9d230702e58edaae082bda750ab036b5af17984392abbb26750eee3dc89d9cb455e7e950145d5e93ce57845b7f19158e6e154df0bdc0d0806c16d1ba47bdcee6 SHA512 ee6b6652ad7c5d774869fc44f6a1398bf9991fd49a91dff25b166c91608c62565f2e5d0749a7f695d49d1b5e54baa798870d2c4080b290fa33059e2d684711f7
+EBUILD sndpeek-1.41-r1.ebuild 1596 BLAKE2B e2b7d7d402e43d287ab8b6d0773276b74b3590ac807797a38ae0624b281b5be33f256519192c2450b43ba2275ddc2ae6bb58e986671870a953ac2528578d1e6b SHA512 92a104f57ff04855bd50c0b0f6fb646c33cdcb2248fe6fa58402d4d4afc1595261e49860f4ef97c8f4b6fc1d7f995c0755bfb580c3f54409a695ac5857a2242c
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/sndpeek/sndpeek-1.41-r1.ebuild b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
index 8d5d56db8675..bbe0f7e6f139 100644
--- a/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
+++ b/media-sound/sndpeek/sndpeek-1.41-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,8 +39,8 @@ compile_backend() {
 	backend=$1
 	cd "${S}/src/sndpeek"
 	einfo "Compiling against ${backend}"
-	emake -f "makefile.${backend}" CC=$(tc-getCC) \
-		CXX=$(tc-getCXX)
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
 	mv sndpeek{,-${backend}}
 	emake -f "makefile.${backend}" clean
 	cd -
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 125d3c3ae336..dc5d61eb10fa 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
 DIST strawberry-1.0.1.tar.xz 11191132 BLAKE2B e182ec5db26b22b60e9393b3a418cf44c01b647ab268bafe6d3f098d879817563d68faf7962f0670017f70b7f9f64f3a680056002e7041a2dc956fdc1dceeb95 SHA512 6a668ba6dbdcd5c60e78190c2cc8c04ad4ed920102c7555fdd42f6bf47c5b4004f9580c0f009cade642b404f6884b2b5dac386d326bf6f234403e4ba7612a2bb
 DIST strawberry-1.0.2.tar.xz 11202768 BLAKE2B 555c9492a6c10e9df579d4e9b1c718c722531f21784f68a436d8bd313a6950f0cfc58ded85f9a144de12a73ab07a0cc4d0e028223122dd4fde6604eb92145bd8 SHA512 196be23dde8fee531b2996bc7dacaf5b00dcd3f1aaaeb6630ed2a2fdeb777abb66d6c19928fc157dde7d5bceffdc646ff615a6d52bc0e6ee5ddcc14de6ee7a59
 EBUILD strawberry-1.0.1-r1.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
-EBUILD strawberry-1.0.2.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
+EBUILD strawberry-1.0.2.ebuild 3069 BLAKE2B 37799426ea976b6d26c43f253c14004c7e0f7e666b3f926277b749c231c767eca42514b1eb9dada51f9671aecd0a7c26fca6e7d85e012fc755d280ccb462546f SHA512 1962135b5e8ed7f02b5d1824e84f8c5ed5db9de24f03cf76160c15926d8ea81a70e09766da52be86fe9c1a848c885658c65448789446f87720d4bd4b35f21ecd
 EBUILD strawberry-9999.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.2.ebuild b/media-sound/strawberry/strawberry-1.0.2.ebuild
index af868219fe69..ca2abcebaa8c 100644
--- a/media-sound/strawberry/strawberry-1.0.2.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest
index 35a0e0327df4..6c61b5e35335 100644
--- a/media-sound/synaesthesia/Manifest
+++ b/media-sound/synaesthesia/Manifest
@@ -1,3 +1,5 @@
+AUX synaesthesia-2.4-inline-keyword.patch 558 BLAKE2B aaf978da81fa7edbffbf479c16fa51db7a765a3889356d724dde2d1a2f342b853077d020429b983c9fda75b19f4d7833015b7a5e645cc50d0e389d6aad58ebec SHA512 468e9e94428adc8a639f647be8ebdee9d5c4b0a91489666a1afcf0e19d9eb26825d36ed9968502cf9926e19124d7d1af0d3f27aa375967d4255976b9932bb4d6
+AUX synaesthesia-2.4-respect-flags.patch 187 BLAKE2B 96739009fca0649c417b82c281c90f91aac4674e8f432f8be54b5d75a01586f86f84b8f05cfe8839c3ffc6b96e25446d99c492e8b6fe2fc686e9abd7edfe6db7 SHA512 c1a8fc2ef1c5f0bab7ed0cadb183082aff00a9484b25ded5c095653634df9bd69252ecbb3c6ea37ae77edf5423d04a4a60336db9669c44388af17f39b0eee3cc
 DIST synaesthesia-2.4.tar.gz 259531 BLAKE2B 2ecf15a58793de77addb2dc2ab6d7640902c4a34838cff158d7bf9ce0ea5ee171cc205d2c8d9ee3a07d5434fd8e0e48f0cf1bf8c9d5b53de9cb9b70799cfc9c7 SHA512 e48f210f055486aa0a7c9a03f6aa7ff6a3292a2b598bfd8536dd592c3934b7672ed0b9b7dfc20427b5ea2b4cd1dcd6e104bf2c41f80ec38ab0b4b0a9497ff905
-EBUILD synaesthesia-2.4.ebuild 718 BLAKE2B d36669fcef5323373bd1d0f04c43f982c382aba69d6b5471cfc0c0e0124bd9708617c7a5248266ecc2dcbfbcf6b10b5c1b5ef404f36bb417b9efd40fddf12131 SHA512 e854d3d82dca84716746fe7bbff4ca49052966dce66333ebb51d894b43fff53d6c2ba3c1d09e4f4cb14d5b8db6c01c4fd50b045f2092522dfbcbf66646a15c12
+EBUILD synaesthesia-2.4-r1.ebuild 608 BLAKE2B 5af19d266c0e1a92629970742e222b158cbb239c29aab632557391c4a3b6968460fc81e11077dc2adbea4d03908379ce5164a79a4b7bb5e0d174a4212510ef64 SHA512 e79d716f04dd789ecd88f1dd5703dbeeb99581a7aa99c8bbf0e625a4bb2838bae9178e0371c8d616e00b80b8fb9d66d0cec89f34f0fb378ac5388c9ac6e586d6
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch
new file mode 100644
index 000000000000..ef93f24029bb
--- /dev/null
+++ b/media-sound/synaesthesia/files/synaesthesia-2.4-inline-keyword.patch
@@ -0,0 +1,14 @@
+--- a/syna.h
++++ b/syna.h
+@@ -73,9 +73,9 @@
+ #endif
+ 
+ void error(char *str,bool syscall=false);
+-void inline attempt(int x,char *y,bool syscall=false) { if (x == -1) error(y,syscall); }  
++inline void attempt(int x,char *y,bool syscall=false) { if (x == -1) error(y,syscall); }  
+ void warning(char *str,bool syscall=false);
+-void inline attemptNoDie(int x,char *y,bool syscall=false) { if (x == -1) warning(y,syscall); } 
++inline void attemptNoDie(int x,char *y,bool syscall=false) { if (x == -1) warning(y,syscall); } 
+ 
+ /* *wrap */
+ struct BaseScreen {
diff --git a/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch b/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch
new file mode 100644
index 000000000000..7a9523ee8b9a
--- /dev/null
+++ b/media-sound/synaesthesia/files/synaesthesia-2.4-respect-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -1664,8 +1664,6 @@
+           ac_config_commands="$ac_config_commands default-1"
+ 
+ 
+-CXXFLAGS="-O4"
+-CFLAGS="-O4"
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4-r1.ebuild
index e431ff390070..57f8faec27b7 100644
--- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="a nice graphical accompaniment to music"
 HOMEPAGE="http://www.logarithmic.net/pfh/synaesthesia"
@@ -12,16 +12,15 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="sdl svga"
 
-RDEPEND="x11-libs/libXext
+RDEPEND="
+	x11-libs/libXext
 	x11-libs/libSM
 	sdl? ( >=media-libs/libsdl-1.2 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
-	default
-	sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \
-		-e '/CXXFLAGS=/s:-O4:${CXXFLAGS}:' -i configure || die "sed failed"
-	sed -e 's:void inline:inline void:' -i syna.h || die "sed failed"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-inline-keyword.patch
+)
diff --git a/media-sound/vorbisgain/Manifest b/media-sound/vorbisgain/Manifest
index 916aefea44b3..8e974440b02f 100644
--- a/media-sound/vorbisgain/Manifest
+++ b/media-sound/vorbisgain/Manifest
@@ -1,4 +1,4 @@
 AUX vorbisgain-0.37-fix-errno-and-warnings.patch 2111 BLAKE2B 3f24e408b6931d5e59ca04f47e17366f42579beb8119fb8208cbc86513644df25277c6cad9f0885916adcdf724ccb6b915c1064da27a720a864a7fcbaa222543 SHA512 f42aecb99865f60c91814daaa615dd55e84f391d622d41310c12c5f570bbe7628e903802590a6866ae10a02c7f6982bdac208b5a1b191bb49efcd3ea66a86062
 DIST vorbisgain-0.37.tar.gz 208977 BLAKE2B d29185dc2ddccb97df94b164747d9fcf3c06ac5e2f602f7ca24d9d38b20792525188b697c74728a5992626fd7ef4748fd8a9adee165802f51f88b54be6be3f67 SHA512 67181834e1a0d7c6e1ccd984e2d30ebf1dcdff84caa77f75e5e771de8414904810e966a43852b7184e075d2428fd8b431124835efc370ce6504b8b2756746e04
-EBUILD vorbisgain-0.37-r2.ebuild 593 BLAKE2B da9028b8b2ea00cf514c5266c96b5c37a63560c983023ab1cc5c2726f9fdef239e4d60f5eaf8d67ef73a148a856740122c6aa4ed3d502c1a9bd6469ac000f0b4 SHA512 4517d6733302612a367bf254243dc96fc117522f08fd4b3c51ea8812ba1d8b553c1b67b66527fc94779fb5dbfc1973ec949e3da6e63c8fc77ce454fa937946c9
+EBUILD vorbisgain-0.37-r3.ebuild 599 BLAKE2B a1baa5f2d05ea71629b5ac12b50e33e428dc40a41659aaa77e810b5b213f4c98e348b50a608a510004ca77b6fa6453da20b593d09e156457817114f09d4d3447 SHA512 3e3e2fb75ce0e3d13c7751f5b418769a258fbf1130d1c628f23123675f1542cec4739f9e9a0c20e982fe65bf1e79adb2213ea267e3d4cb1d7b1be2aeca511810
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild b/media-sound/vorbisgain/vorbisgain-0.37-r3.ebuild
index 89c9d228496b..0757e73f9d65 100644
--- a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
+++ b/media-sound/vorbisgain/vorbisgain-0.37-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Calculator of perceived sound level for Ogg Vorbis files"
 HOMEPAGE="https://sjeng.org/vorbisgain.html"
@@ -10,7 +10,6 @@ SRC_URI="https://sjeng.org/ftp/vorbis/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libogg
@@ -21,8 +20,12 @@ PATCHES=(
 	# bug 200931
 	"${FILESDIR}"/${P}-fix-errno-and-warnings.patch
 )
-DOCS=( NEWS README vorbisgain.txt )
 
 src_configure() {
 	econf --enable-recursive
 }
+
+src_install() {
+	default
+	dodoc vorbisgain.txt
+}
diff --git a/media-sound/xineadump/Manifest b/media-sound/xineadump/Manifest
index fe44200092af..78eb975bc53e 100644
--- a/media-sound/xineadump/Manifest
+++ b/media-sound/xineadump/Manifest
@@ -1,5 +1,5 @@
 AUX xineadump-0.1-gcc-4.3.patch 625 BLAKE2B 5ec66e32b495c4e82617ee0003726378e99aac79cd7605f8d41e18c467fd61f66ac0a936b8032f5607e87d9c93beb0343d7876fe5496305f4393daff3a3f56b8 SHA512 8c1b8b6d1e356438dc201064d9b1355ceb3e83f26b32e7d659d68b06a538b2eeccd6549f9e58f9c60330e523f1fa07e706ba58b4c1807fc9ec499e4b57b6924b
 AUX xineadump-0.1-gcc-4.4.patch 436 BLAKE2B 4b887b02badc301c5049ba5a9bb06e03e7d83bcbaab08e413f68a2c42076dfed695dd3a459de29f7de24b13335b92ddb0b4c9250300112a14eaa0b14f6961ae6 SHA512 f37f5c68fe1bd7b3d60fdf769122eb8bf5187c736d9b330b143603cf82845b95f1cfcc8ba4f8f817f6b5fb647bed1e19f698362459272ac6e12f05ec217f69ac
 DIST xineadump-0.1.tar.bz2 233413 BLAKE2B 777aa2c044d38f12a552efd795181b48343fb3e19bc1fd5b485c445c8244270b87ec47c898b61d3ee0ea6c573897ec2195a93c33ecb4a9772153e61fe1b9f671 SHA512 879d147a451133e78835fb367a99f58ab9516746eec2a748fc11913db43f87f89af09649a7ae5e43362b44d97187a5ee58e41a6776894d8f2dfcd188c67c29e9
-EBUILD xineadump-0.1-r1.ebuild 517 BLAKE2B d6fa470591afedde8c374949883a844687957f49d2d30eeb6554d1669f76dcd5bb3c30ba5f712c0782ce52dfa450aac19fdd85e83d3748f7a87fa1011f195edf SHA512 a218f0923d6ba867e869eb8006c3443b7630d2a354600cde255b0b98f6c2ead5d45050e56e7ccf9ec45c603a34641551c67a00fd87d41234f13b2fc84717d94c
+EBUILD xineadump-0.1-r2.ebuild 509 BLAKE2B a2b583b90e970b214d239cc7174d139ccc64268042b31414347bca9ac4e129a092f02f99780194e6bcb25c4d18e80a528c828b8c0ca2abf64ed41dc863da55d9 SHA512 870eb8ce139c7cafaedcba314547f58d5a0db3133c2a2bfdc974d1e47773678541dcedc47a74db62bdf74161ba678f59eb28562ba7167e949d145b16bfb4dcb5
 MISC metadata.xml 343 BLAKE2B 560a21f5e9ee9c09a80bc88fdf7fbac76943de7cea88862409335d4fa11e919fa8db3a2dda5e458ba924afb3f9e4ec5cc2e291186c1df9562ecfed68dba13221 SHA512 ccaa6a56a56fb1de4a185c19356c787eb7bee8787f3059a22b79d81f65595dd1b19edbfe8aeb63c3f3310a8fbc140d57c8a134ffbc97ad1a76b32842b4a4bb99
diff --git a/media-sound/xineadump/xineadump-0.1-r1.ebuild b/media-sound/xineadump/xineadump-0.1-r2.ebuild
index df5b84d849c1..0ad5a7012fd1 100644
--- a/media-sound/xineadump/xineadump-0.1-r1.ebuild
+++ b/media-sound/xineadump/xineadump-0.1-r2.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Utility for Xine decoding support in transKode"
 HOMEPAGE="https://sourceforge.net/projects/transkode"
 SRC_URI="mirror://sourceforge/transkode/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="media-libs/xine-lib
+RDEPEND="
+	media-libs/xine-lib
 	media-libs/alsa-lib"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 PATCHES=(
 	"${FILESDIR}/${P}-gcc-4.3.patch"
 	"${FILESDIR}/${P}-gcc-4.4.patch"
author	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-24 23:59:54 +0000
commit	401101f9c8077911929d3f2b60a37098460a5d89 (patch)
tree	c2bef4719f6787550f0916aeaa8f4f403a9296af /media-sound
parent	4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)