gentoo auto-resync : 09:05:2024 - 00:01:03

12 files changed, 232 insertions, 9 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 92d94ca31ec4..00c6ad30e010 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 8004488a7752..675867302102 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -3,6 +3,6 @@ AUX 1.6.0-mediafile-test.patch 1613 BLAKE2B 488d8bdf7950d03bc37584c6ff64f3ea6329
 AUX 1.6.0-sphinx-6.patch 1114 BLAKE2B f37fe23ea86e47ed6eaf5705ae569103d3ae3b5141b9c80c22b30c650a499f915951e5db3e420e36d2829e3508d3e75729391a5de90cfa809271361692c4f485 SHA512 fe2290aec4d6356d4bd2690bd716370e45ae45f98845fb42adda9fab160f306c076f31fd30971f69431b7507917e201d82b494a49d34bf4549024b4df701a83a
 AUX 1.6.0-unicode-test.patch 1703 BLAKE2B efcdba4db1a7377954b768770d41ce8377d391bb4507bc099aae96469ac0eb250b7458c92013703b6b9d0498a62379a5fb9973b467418b8f6c8af4aed94b0829 SHA512 102d154b30617ab64511ad04ec92e33b58603da04caa7812324cc4a10e0caafeaa1e3c286bfbc712e5c09fc23f250d5a4b10ea5ab5112dea316269d80971e20a
 DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc
-EBUILD beets-1.6.0-r1.ebuild 3886 BLAKE2B da54b5fd5be7247daccbd63ff1275548cadab67fb539e05be17660c4e761fe0120ca1f492add082d55d410c382d6b6fe647e327499b9d195780b6afa0a6783ff SHA512 606b4699b74b0599b8d76c753ebb6501140ef9e6a9c23ac5cf7c68d5decf73c004bb47cd4e20f465d28d178fa3ac4b593c40d2db81f586fcd48ed0eaca80c946
-EBUILD beets-9999.ebuild 3701 BLAKE2B b549f60280377a6679289052336da39fffb545d9f2a4a09a20f9f3e2d975d284ee26a106c9bb54fb0c637814175f6fcee8f33ca543a2c7162413549e5b85d372 SHA512 5ff33132b7f084a86d1698db01612c3ddb7a6ae1136f0b6f5d824b4e00219a6987f8bda7e893348b839cc351dc9d315fdd15a867db8ce967223312dc20f84806
+EBUILD beets-1.6.0-r1.ebuild 3889 BLAKE2B 2485471aef9f8de01da210a0df8c3bf200fe3da07678b042fab9e71da07dde762a04853e3649bc5da6f8e37e5af172287b9765bb83397eb5392a66f779eba298 SHA512 b5438fce4e06c93271e3dab141526529386c9ba1ee1f1850137f5fb8f40363bda69499af4206f4f46d5728c26368ebca57f664b99ead09dba4a06e3a6991853f
+EBUILD beets-9999.ebuild 3704 BLAKE2B 5344c966331f65a40c373625cbf93db68120b9f5e8e2903c33ac268aadc325406a36c17262f679d37327f977beb9c749e00eeb905b263ce8a546b45fde1e8a3b SHA512 faaf963be227dbb3443fef02fe40547c5e6007e8a0628c4fb8b66edb7104e5e82b666c92d506231ca96f79b6e295a08eb44f7ec32e12e0f947dde232b4049ccb
 MISC metadata.xml 1862 BLAKE2B d2a1ec84e18bf236467d19d90ad7917a4b9f3846f61d9e4ddd1cf8b9e50c93afe834a13e3421f9873f8a63b590727a7e73d4a0edbe5bcfd986aed7fb04c11621 SHA512 79eaa60bc64cdea05a2197946dd1ee9d08aafac92eab5ad9236833d1dd5d0bb21476dae86e15b086a1ee8946833b44ccde472ee729a694c398497663416913f0
diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
index cdc5158e3f60..5d407a5cc040 100644
--- a/media-sound/beets/beets-1.6.0-r1.ebuild
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -98,7 +98,9 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
+	fi
 }
 
 python_install_all() {
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 03d6d8352705..8c8520a503a4 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -91,7 +91,9 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
+	fi
 }
 
 python_install_all() {
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 5d772bb2665a..7d33b5191eeb 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -3,5 +3,5 @@ AUX cdparanoia-pkgconfig.patch 2669 BLAKE2B d093fab1a683ff7713dd2fd9e0437d0fb0db
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
 EBUILD cdparanoia-3.10.2-r7.ebuild 1454 BLAKE2B e0707a180db7411bc2f026a3c659895c87639686e8ac3350bb31d67fcfcdf8b55a0877fa6373dd8321b3997894a8a63077ca750c2e5a9e3cb266000b55ce9a52 SHA512 cdd5f6adca1a8799a9850721339fcadfdd04e1d3dc19a58ceab8e4bab40674cfb98f971500687500e4a8fd1648f0f8aa987ab2578f03ddf246077669ad911e8a
-EBUILD cdparanoia-3.10.2-r8.ebuild 1493 BLAKE2B 34d59a105dba8bbcc299113e74663070a5fb7bb48008c1b9080c64b8f9b06bc1e050cf6de531dd739197ac19829ccac0caacab04e8c76712a9d5dc3c0e3459ec SHA512 4495b0f3ff3c6e1680fbca7fe89776921f727142c2897ee4d973e44db94752b59beb3a462568a452611d8c23ad7d62cd5d77814d2ab831681f60786fb21c4a05
+EBUILD cdparanoia-3.10.2-r8.ebuild 1486 BLAKE2B 6feccd9344543678c778f1fa514587ab17e5ff4a22aafa37e6867651f07e155d140fb4893d1d1548e9470467db327f28e007c28d250246cba35ccc121113e893 SHA512 9ec4cfe9c23b5a37d78ba799bf6303ea9b8cdb7e5492dee8ee8b7def884787961cfa641e11196ec2c9f23ef0fe0e41a4c6b3f18317f1f51074cd749cc382cf91
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
index 5b851fbabf37..4a5d130489a5 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 IDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index e3547b264fd3..93980ec48240 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,5 +1,6 @@
+AUX mpfc-1.3.8.1-c99-incompatible-pointers.patch 1542 BLAKE2B e5d94d8e8af5be076f4366efac8ec7ac2916b660037d6c9766404d20039cfb92072155d99b48873989dd470870ef734d6ef35e85147ab85ea1409cdc1b0a8982 SHA512 359f8834826598ef3870237934ae30dace6cfcd6405d35248f2acd807fedb8045609a1a8f873745ab8ce64998313878bf7b88fc88d1433adccf8810b3e490f1c
 AUX mpfc-1.3.8.1-fix-underlinking.patch 960 BLAKE2B 5eee0cea45c470b6837120cd89fd9dc180a5f295c5fcaa08a640009c51b37c3397e0f2f9755dc1baf7ac1af0f6003895368a333f1b8304b5fa096bb7a99a5e84 SHA512 117c49a7893c95b8b7e592aba76afd4f05f076b88db303a4fcb0efdaad351008bd91d88d06f278586920907c54801df49c7101c8dc2e41475038244cefd6a480
 AUX mpfc-1.3.8.1-qa-implicit-declarations.patch 4938 BLAKE2B 117d2f5aa9290aa49b65bd8cf085fe30068ccdd558a8c18a5e6b94ebd27eeb07924aeb2f0735499cce7d520b5fa86cc69f6f49580d197979162837b4c906f107 SHA512 afd61c08964b237124316a7cad4cecef29d8c269c6e2d0c645d81272167e9f7de2b3c1ef33e2877e1b5f2c0a4021bf2e548a04976142c22e889a6cf769807233
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573
-EBUILD mpfc-1.3.8.1-r5.ebuild 1212 BLAKE2B ec062412b17cdda476cf37fb76ba122d7db2af97063ee77469ad702412f5b4a0825c4568e76cfe0615be366db5dfec082be1fbc3b3f37880f5785644a32ca3b4 SHA512 a4d40c9300c1c34085cf1c77d9ec12f4e2463f409fb063180305b564cdba93ea4d56a894b8d7c437ef53a7e2780c53998e837419b464b41f6a4b5b9099c9d0fc
+EBUILD mpfc-1.3.8.1-r5.ebuild 1264 BLAKE2B 8a369e3d7470fabb7dbb0bfa96140ea039959729e0f00b1ccd1d6385af3eeaa77f6a22ca2e64e0d859be59d0212364b77346075555e0d162326a832b82751e03 SHA512 27a7226065603154f4df30e100be67e2132b1edd4c1dad1926420904ad9963fe5893bf61cb03491f595140375fda792ee7e833697b23adec18751d6618385235
 MISC metadata.xml 414 BLAKE2B 80916d7f217ba95f9f59a798c02014a997ece827ee7c7477cc3044edeb678d98cb66b26bacd0c9d6b42b39612045dd94f58a3f58203ad769f68e9216b494bc57 SHA512 9bfb767a9a834ffcbcd6e2a885bca8c4b3068760ad00ad6dff2d63c837a8db9b76f8aa4121c754546d49bbd8ebde866d7920cdaf0b02b006d1a5ae020023d70a
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch
new file mode 100644
index 000000000000..364888855198
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch
@@ -0,0 +1,50 @@
+Closes: https://bugs.gentoo.org/921021
+diff -ur  mpfc-1.3.8.1.orig/src/player.c mpfc-1.3.8.1/src/player.c
+--- a/src/player.c	2024-04-01 17:05:09.855312224 +0000
++++ b/src/player.c	2024-04-01 17:08:54.586992161 +0000
+@@ -2673,14 +2673,14 @@
+ 	{
+ 		player_pmng_view_t *v = &views[i];
+ 		int index = v->m_list->m_cursor;
+-		plugin_t *p;
++		general_plugin_t *p;
+ 
+ 		/* Get info */
+ 		if (!v->m_list->m_list_size)
+ 			continue;
+-		p = (plugin_t *)v->m_list->m_list[index].m_data;
+-		char *author = plugin_get_author(p);
+-		char *desc = plugin_get_desc(p);
++		p = v->m_list->m_list[index].m_data;
++		char *author = plugin_get_author(&p->m_plugin);
++		char *desc = plugin_get_desc(&p->m_plugin);
+ 
+ 		/* Set labels */
+ 		editbox_set_text(v->m_author, author == NULL ? "" : author);
+@@ -2688,7 +2688,7 @@
+ 
+ 		/* Synchronize effect checkbox */
+ 		if (i == PLAYER_PMNG_EFFECT)
+-			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, p);
++			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, &p->m_plugin);
+ 		else if (i == PLAYER_PMNG_GENERAL)
+ 		{
+ 			bool_t started = genp_is_started(p);
+@@ -3198,7 +3198,7 @@
+ 	player_pmng_view_t *v = NULL;
+ 	player_pmng_view_t *views; 
+ 	wnd_t *dlg;
+-	plugin_t *p;
++	general_plugin_t *p;
+ 	int index;
+ 
+ 	/* Determine our view */
+@@ -3212,7 +3212,7 @@
+ 	index = v->m_list->m_cursor;
+ 	if (!v->m_list->m_list_size)
+ 		return WND_MSG_RETCODE_OK;
+-	p = (plugin_t *)v->m_list->m_list[index].m_data;
++	p = v->m_list->m_list[index].m_data;
+ 
+ 	/* Change state */
+ 	if (!genp_is_started(p))
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
index 7c1422cff42e..b7120a8c0b73 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-underlinking.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+	"${FILESDIR}/${P}-c99-incompatible-pointers.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index dcbfb4c14630..d12c6fa229dc 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,4 +1,6 @@
+AUX whipper-0.10.0-ruamel-yaml.patch 3317 BLAKE2B acee6df0afacec79cd2d98610803f2882099c0dc49a1ecc50b7b5b449c6b55bc20890f980477701e5cc0ac3af0606d2dd89e261024d0b3f0969d7b9917281be6 SHA512 893e2f23717633971410e0f9917345eaec5af313d83702b36a2693b51eaf54d755d58db864de82e13e8506dc98ab548334d7ba6d02fd6c200bd0670e4bca73bf
 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
 EBUILD whipper-0.10.0-r1.ebuild 1748 BLAKE2B 0aa45feb70b980e423f80551ce4e2e0a4811ea9cafe11afc8bcb046aff5ece9af5ec0868104c93404c801ffaf7194a84f208b03c5c932c087abd95b843d8a579 SHA512 510581d73f13e3de3447bf07f9c8804910194fb9dcf606a23ebc690157418e66e72a558e638e9b1be6d59fe6c11f469baf8b63792a46751d175eef7a9c875edb
+EBUILD whipper-0.10.0-r2.ebuild 1363 BLAKE2B b4fe303d499f1c795f02d9a10fa496043510467bb46fffe322e23bd86aebbf207aa9b3e53b46d78860cde263bf95c0a16941b67fe635e8d911bd0b39430421c0 SHA512 c82c4718bf66ad1b27ca8df01fec2012b5afc8d56f9c27595b8e9c6fecb91ca6650ea4cb80004114521bc7abf8222f964a551ddb761bd7b2c3d4ef8df7116365
 MISC metadata.xml 660 BLAKE2B 5cd7471def3d4a0cdf0f391ba307d071ef474c9121db39b72371190b05d857b2488226ff5c7fa66aa54447bfec2b2c4c30d9fc3439da6c82937c6dc17fa52c6a SHA512 233494f7efc67d89a4f7fbf01f94c8fe47054d1a311ce88163c527de6c582a6ecde56f00b3f6e003a986afb41ccd2fa92c044e7d35ffcca290cf17778ae30ef2
diff --git a/media-sound/whipper/files/whipper-0.10.0-ruamel-yaml.patch b/media-sound/whipper/files/whipper-0.10.0-ruamel-yaml.patch
new file mode 100644
index 000000000000..206547e4b3e9
--- /dev/null
+++ b/media-sound/whipper/files/whipper-0.10.0-ruamel-yaml.patch
@@ -0,0 +1,109 @@
+From e0942417a1c267781a8b676789730457dcb2e6fa Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Sun, 20 Jun 2021 15:18:37 +0200
+Subject: [PATCH] Use custom YAML subclass to be compatible with
+ ruamel_yaml>=0.17
+
+Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
+---
+ whipper/common/yaml.py             | 18 ++++++++++++++++++
+ whipper/result/logger.py           | 11 ++++++-----
+ whipper/test/test_result_logger.py | 14 ++++++--------
+ 3 files changed, 30 insertions(+), 13 deletions(-)
+ create mode 100644 whipper/common/yaml.py
+
+diff --git a/whipper/common/yaml.py b/whipper/common/yaml.py
+new file mode 100644
+index 00000000..4edb0b36
+--- /dev/null
++++ b/whipper/common/yaml.py
+@@ -0,0 +1,18 @@
++from ruamel.yaml import YAML as ruamel_YAML
++from ruamel.yaml.compat import StringIO
++
++# https://yaml.readthedocs.io/en/latest/example.html#output-of-dump-as-a-string
++class YAML(ruamel_YAML):
++    def __init__(self, *args, **kwargs):
++        super().__init__()
++        self.width = 4000
++        self.default_flow_style = False
++
++    def dump(self, data, stream=None, **kw):
++        inefficient = False
++        if stream is None:
++            inefficient = True
++            stream = StringIO()
++        ruamel_YAML.dump(self, data, stream, **kw)
++        if inefficient:
++            return stream.getvalue()
+diff --git a/whipper/result/logger.py b/whipper/result/logger.py
+index b7043adc..f4471a00 100644
+--- a/whipper/result/logger.py
++++ b/whipper/result/logger.py
+@@ -1,12 +1,12 @@
+ import time
+ import hashlib
+ import re
+-import ruamel.yaml as yaml
+ from ruamel.yaml.comments import CommentedMap as OrderedDict
+ 
+ import whipper
+ 
+ from whipper.common import common
++from whipper.common.yaml import YAML
+ from whipper.result import result
+ 
+ 
+@@ -148,11 +148,12 @@ def logRip(self, ripResult, epoch):
+         data["EOF"] = "End of status report"
+         riplog["Conclusive status report"] = data
+ 
++        yaml = YAML(
++            typ="rt",
++            pure=True
++        )
+         riplog = yaml.dump(
+-            riplog,
+-            default_flow_style=False,
+-            width=4000,
+-            Dumper=yaml.RoundTripDumper
++            riplog
+         )
+         # Add a newline after the "Log creation date" line
+         riplog = re.sub(
+diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py
+index 411b61af..98c89ab5 100644
+--- a/whipper/test/test_result_logger.py
++++ b/whipper/test/test_result_logger.py
+@@ -3,8 +3,8 @@
+ import os
+ import re
+ import unittest
+-import ruamel.yaml
+ 
++from whipper.common.yaml import YAML
+ from whipper.result.result import TrackResult, RipResult
+ from whipper.result.logger import WhipperLogger
+ 
+@@ -163,16 +163,14 @@ def testLogger(self):
+             ))
+         )
+ 
+-        yaml = ruamel.yaml.YAML()
++        yaml = YAML(
++            typ='rt',
++            pure=True
++        )
+         parsedLog = yaml.load(actual)
+         self.assertEqual(
+             actual,
+-            ruamel.yaml.dump(
+-                parsedLog,
+-                default_flow_style=False,
+-                width=4000,
+-                Dumper=ruamel.yaml.RoundTripDumper
+-            )
++            yaml.dump(parsedLog)
+         )
+         log_body = "\n".join(actualLines[:-1]).encode()
+         self.assertEqual(
diff --git a/media-sound/whipper/whipper-0.10.0-r2.ebuild b/media-sound/whipper/whipper-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..4458574acf2f
--- /dev/null
+++ b/media-sound/whipper/whipper-0.10.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{10..12} )
+
+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/musicbrainzngs[${PYTHON_USEDEP}]
+	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/discid[${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"
+	"${FILESDIR}/${PN}-0.10.0-ruamel-yaml.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
+}