gentoo auto-resync : 23:04:2024 - 23:59:26

4 files changed, 14 insertions, 63 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a529a8304487..5fd801381926 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 5bbb7d4c90b3..dcbfb4c14630 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,5 +1,4 @@
 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 1739 BLAKE2B 3c890c7aefa7507cf75f5ce1fa8e43166ef5c4b8c386a5bd60c7b793dfcb0bb28ad43c56a80bee2865599cc3aba5b9ed700926567b0aa343de7d7b8e0ed4e056 SHA512 743ad0f86493eca6bfeffaba0f343c8b789497c1f6004e162f5544bfa66a609dce0bf09150d51fd6035537b5d40c839f9310f61c6ae5feaac7f5a0bedf28d206
-EBUILD whipper-0.10.0.ebuild 1570 BLAKE2B 3af145c7f3860248892bbf6749996424cd126240450d7f8b04cb66e6a557c9c5d70e5b9a96f871d76905276ad8a218f76cfd13b4590f6cefefb87e927c6ba784 SHA512 8d19b56ab591b0668c1fb3e2f6cd2930eece004047adc6b0f2f9b53b49b379b650c6322ec14cd66ada81810e425dfaeabaad39a6c5fe54b49911f33dd7cfdfc8
+EBUILD whipper-0.10.0-r1.ebuild 1748 BLAKE2B 0aa45feb70b980e423f80551ce4e2e0a4811ea9cafe11afc8bcb046aff5ece9af5ec0868104c93404c801ffaf7194a84f208b03c5c932c087abd95b843d8a579 SHA512 510581d73f13e3de3447bf07f9c8804910194fb9dcf606a23ebc690157418e66e72a558e638e9b1be6d59fe6c11f469baf8b63792a46751d175eef7a9c875edb
 MISC metadata.xml 660 BLAKE2B 5cd7471def3d4a0cdf0f391ba307d071ef474c9121db39b72371190b05d857b2488226ff5c7fa66aa54447bfec2b2c4c30d9fc3439da6c82937c6dc17fa52c6a SHA512 233494f7efc67d89a4f7fbf01f94c8fe47054d1a311ce88163c527de6c582a6ecde56f00b3f6e003a986afb41ccd2fa92c044e7d35ffcca290cf17778ae30ef2
diff --git a/media-sound/whipper/whipper-0.10.0-r1.ebuild b/media-sound/whipper/whipper-0.10.0-r1.ebuild
index 451683de80dc..48549099d453 100644
--- a/media-sound/whipper/whipper-0.10.0-r1.ebuild
+++ b/media-sound/whipper/whipper-0.10.0-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
-
 DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -17,7 +16,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/libsndfile:="
+DEPEND="
+	media-libs/libsndfile:=
+"
 # bug https://bugs.gentoo.org/923339
 # upstream https://github.com/whipper-team/whipper/issues/605
 # upstream https://github.com/whipper-team/whipper/issues/606
@@ -32,14 +33,20 @@ RDEPEND="
 	<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-sound/sox[flac]"
+	media-sound/sox[flac]
+"
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests unittest
 
-PATCHES=( "${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch"
+)
 
 python_prepare_all() {
 	# accurip test totally depends on network access
diff --git a/media-sound/whipper/whipper-0.10.0.ebuild b/media-sound/whipper/whipper-0.10.0.ebuild
deleted file mode 100644
index c865bb56dbb7..000000000000
--- a/media-sound/whipper/whipper-0.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-DISTUTILS_USE_PEP517="setuptools"
-
-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" )
-
-python_prepare_all() {
-	# accurip test totally depends on network access
-	rm "${PN}"/test/test_common_accurip.py || die
-
-	# Test fails with
-	# Log [82 chars]28Z\n\nRipping phase information:\n  Drive: HL[2290 chars]31\n
-	# !=
-	# Log [82 chars]28Z\nRipping phase information:\n  Drive: HL-D[2274 chars]31\n
-	# assertion. TODO: fix test.
-	rm "${PN}"/test/test_result_logger.py || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	distutils-r1_python_prepare_all
-}