7 files changed, 45 insertions, 5 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5817f815168e..7d20e68b2df9 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
index 9c5ef2c2e21b..c80f22e5669e 100644
--- a/media-sound/a2jmidid/Manifest
+++ b/media-sound/a2jmidid/Manifest
@@ -1,4 +1,4 @@
 DIST a2jmidid-9.tar.gz 47925 BLAKE2B ad079e76a54f56ee8f82150c306f91aead52f86632978ea6f3376a0bf163744379210b34701b39da4ee14fc4d8a1c6be82d1052abeb8ccf79410bc242d174d62 SHA512 5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c
-EBUILD a2jmidid-9.ebuild 1028 BLAKE2B 32bf417d04dba1619b963f753bdfabd6eb77c3f71267c06a223fae3253bf61e212bf792704e044b4bbb08274353795f1dc37352941b2dc91d4f2a88335523ccd SHA512 94cf207e28e99dd54db40e4b7d93cea02c3f489661621c20ee01ba89f16afefd645a8fcbe951ac6b9663ffdfdcf2669dd9c2e850f4e50769f493f2c15a9a1162
-EBUILD a2jmidid-9999.ebuild 998 BLAKE2B d051acc2ea35ef2e409766cffac24e5322a22a8a81fedf96c6f085cc4a3eabeb041360af2e402b4e9336f4103537b9061a0d6cecc40b5192eecf3a630bf04c19 SHA512 6c91fc1df0831d525518f4de7d0af403b2d9204bc260c1abbc72c7a0870387183a33f3b3e5f38d142009deb5fe5c55e1b597ee0328c8a659f5137de43926a122
+EBUILD a2jmidid-9-r1.ebuild 1028 BLAKE2B 2d34ea4f8e248ee1e0a3ee0dccbbb4f5e91346dd557d787d1524e0d147f40540676c5e064bcd9279cba9142aaaa6e05b3d0967a68439b56703ef7f7ca14a9848 SHA512 005338a322bc3a174762a09788a4772fafca935abc0332c5d969acea1eed32e060f81a4fae4ada53980bb15e1ef719b59b22bfe527cbfcd6e0580c61b52de1e2
+EBUILD a2jmidid-9999.ebuild 998 BLAKE2B 8d68f4d9168a8275d6c81e6c2c051cb2295f0ceb899ed78b6628705657b353b6990f307ce9aa5831587754da6970127c2baaeabf8c32d2b4d8c135fbcd23885b SHA512 a4e147dc97a48b1ac426e04fed0149df6dca0799db96845eb63b144259785718fdca57f3e74a2de837f4dda74ac89de6618ec3434b3f1713da49f7e41e3a12c2
 MISC metadata.xml 519 BLAKE2B f3fd9aab93d2e3a16ada0fa1d876d5eacc5d515596308f5db111c192a3296e2813a329f83e90d467090652b078d9855bf6c03b6882e124001a56c6671a10cabe SHA512 fffd096c9013e2727928dd62c6755b929046ed968199e423fd5e480ca66c16bc2d8179f35e1d61fdeba7178a3819f8bee61ba22e5bdfb26393e7e91f6fac1425
diff --git a/media-sound/a2jmidid/a2jmidid-9.ebuild b/media-sound/a2jmidid/a2jmidid-9-r1.ebuild
index eef4ab470304..6611af19c248 100644
--- a/media-sound/a2jmidid/a2jmidid-9.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9-r1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst internals.txt )
 
 src_configure() {
-	local emasonargs=(
+	local emesonargs=(
 		-Ddisable-dbus=$(usex dbus false true)
 	)
 
diff --git a/media-sound/a2jmidid/a2jmidid-9999.ebuild b/media-sound/a2jmidid/a2jmidid-9999.ebuild
index acfedd2037f8..c3ee5ece2ef8 100644
--- a/media-sound/a2jmidid/a2jmidid-9999.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst internals.txt )
 
 src_configure() {
-	local emasonargs=(
+	local emesonargs=(
 		-Ddisable-dbus=$(usex dbus false true)
 	)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 1d8aa701a6c0..0ddb6f0df526 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -10,11 +10,12 @@ AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d17
 AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e13356e9c8103b7edb239a55e89975e455eb82efa6c0bf348aa2be6eedb10ae95753d3f104d7646cbe21a7dcc45e1274928e2a SHA512 b1f7449d13961f3e5d073f2f8cc0443f5e050733d76cbd94dc2dd764b7b1438339cc9155765637767f692c6781760a8b3776bbdaf36c57f4af7cbc7ca51d81fd
 AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
 AUX audacity-3.2.5-gcc13-deux.patch 2531 BLAKE2B 5fbd985902facc87db733c7db3981f67d5232c1a40259eec5831ad7142c065831ec64f5167a587a7a83736225965d2e4159615845c952cb4a6b5f7a46e9218e7 SHA512 45722981858006be507cb2f9212d34626a40554eb75a6397b1073019433ae16689345ce8b4062b18ee61907f5dd9b51e4f250211b16183a0e82ab6ca32f44366
+AUX audacity-3.2.5-gettext-0.22.patch 1193 BLAKE2B 9410d92db9b6a4b06e91cbae5ba25ec5dc16ee3421c511468a55e0038ed2db70c9d195f7eca894503c1bec023e0efc1006ac36eada4f1e87567828f4288b23c9 SHA512 f8a3187343f11875840d605da11a021d7e1f25fa5cb361432863d3933a3880a5e8df63d6feb6706e88bdb5e0f0e4e5c77ec8d21806003abf66166fe8a28e02b2
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-2.4.2-r3.ebuild 3964 BLAKE2B c73bf208842798e91b692e24b0eda44574d3de4b5f102146e7e244c180546d52b98bb4fb863852b87da922c6c7e889be42ba21e3a3909dd4ca72d974274a2c63 SHA512 eb08275d0e436beb6474ae7f6a2180eab898209cf70b664f2c12fd52ad257f8cfea3b30d281acdd91c36d896dbe42e163da94232831c6801a1c718d3ee2e92d7
-EBUILD audacity-3.2.5-r1.ebuild 6983 BLAKE2B 61db91294d2f723e0e1c2cac0b9b813c2262e3caf12290bedf489c691cbe6454b4b5f23be9d41ecdf073f894b6d667758972e9c480b2c5072e842f3702b7dfa7 SHA512 42daa6d35c3c417b25e56e7d3742327b3e56344ab2eb637aee64a9b59d4cbb0f698600b72231e78c5eea43f195074af303842fb89d73005ff75dafc34566294e
+EBUILD audacity-3.2.5-r1.ebuild 7046 BLAKE2B 906b7e9304938233f7ca69af3788fa076bb2b03841efff9c3f68ab4536be265a9c5de661d2390e0858b6357989834956155c9f9eb51d90cbf62e889f486f5d8b SHA512 b5561ac997acc890008de76d4a65cf784ea15fa2fb28ab89d999bd3ec56ac41482cd3805c78007ead30694d9e099749efcea51a7881b34fb307624906bfac975
 MISC metadata.xml 1512 BLAKE2B 277533c5356fb9fee5f353c14f43886e2823cf11f50deff855e31b039e197dd9daeab65dd133461e468f6bf2862b72e910ea36f67bceedec00a5e2234a386db5 SHA512 f66ee862c1fa473e825afc68186b1e2ecc3e7f4bb49272fde63b7b52afb2075795632c0690dd37ded5390a180720297d12b33360f34a4050640080b906ea0a28
diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild b/media-sound/audacity/audacity-3.2.5-r1.ebuild
index b23b0ca973d6..b9ffe050c949 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -125,6 +125,9 @@ PATCHES=(
 
 	# GCC 13
 	"${FILESDIR}/${PN}-3.2.5-gcc13-deux.patch"
+
+	# gettext 0.22
+	"${FILESDIR}/${PN}-3.2.5-gettext-0.22.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
new file mode 100644
index 000000000000..f84508a2c903
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/909201
+upstream fix: https://github.com/audacity/audacity/pull/4866
+
+--- a/locale/be.po
++++ b/locale/be.po
+@@ -3097,7 +3097,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Памылка (магчыма, файл не запісаны): %hs"
++msgstr "Памылка (магчыма, файл не запісаны): %s"
+ 
+ #: src/FileFormats.cpp
+ #, fuzzy
+--- a/locale/fa.po
++++ b/locale/fa.po
+@@ -3053,7 +3053,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
++msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
+ 
+ #: src/FileFormats.cpp
+ msgid "&Copy uncompressed files into the project (safer)"
+--- a/locale/fr.po
++++ b/locale/fr.po
+@@ -3142,7 +3142,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs"
++msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s"
+ 
+ # trebmuh to check (accélérateur)
+ #: src/FileFormats.cpp