commit: 29d3ec64942c8d20ca64b0d49c7f9032d0c5bf08 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Jun 3 04:52:16 2024 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Jun 3 05:05:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d3ec64
media-sound/beets: drop 1.6.0-r1 Closes: https://bugs.gentoo.org/909990 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> media-sound/beets/Manifest | 1 - media-sound/beets/beets-1.6.0-r1.ebuild | 131 --------------------- .../files/1.6.0-0001-Remove-test_completion.patch | 74 ------------ media-sound/beets/files/1.6.0-mediafile-test.patch | 41 ------- media-sound/beets/files/1.6.0-sphinx-6.patch | 28 ----- media-sound/beets/files/1.6.0-unicode-test.patch | 47 -------- 6 files changed, 322 deletions(-) diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest index 7939d4065748..7e408c416fcb 100644 --- a/media-sound/beets/Manifest +++ b/media-sound/beets/Manifest @@ -1,2 +1 @@ -DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc DIST beets-1.7.0_pre20240501.gh.tar.gz 2247319 BLAKE2B e215c8a2a30a44d298746351be4fa2de1cebb7d6aec2bc7dfc679b133ea5eddefec20d038aa1aa1d734b176c09163b93f917c6c29ea5115c4c2349e090c8c5df SHA512 f397c72b481d7d8822db598ab37c99d0b9063ae45455c0d34116fab7b5a4cc683a3357bdfe436181b1dea46ee05192cc37faf355b5e093d63c2e440e523b92bc diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild deleted file mode 100644 index 05075184f5f8..000000000000 --- a/media-sound/beets/beets-1.6.0-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 bash-completion-r1 optfeature - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/beetbox/beets.git"; - inherit git-r3 -else - inherit pypi - MY_PV=${PV/_beta/-beta.} - MY_P=${PN}-${MY_PV} - KEYWORDS="amd64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Media library management system for obsessive music geeks" -HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"; - -LICENSE="MIT" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}] - dev-python/munkres[${PYTHON_USEDEP}] - >=media-libs/mutagen-1.33[${PYTHON_USEDEP}] - >=dev-python/musicbrainzngs-0.4[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests-oauthlib[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] - dev-python/reflink[${PYTHON_USEDEP}] - dev-python/confuse[${PYTHON_USEDEP}] - dev-python/mediafile[${PYTHON_USEDEP}] - ')" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - doc? ( - dev-python/sphinx - ) - $(python_gen_cond_dep ' - test? ( - dev-db/sqlite[icu] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/bluelet[${PYTHON_USEDEP}] - dev-python/python3-discogs-client[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyacoustid[${PYTHON_USEDEP}] - dev-python/pylast[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-mpd2[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/reflink[${PYTHON_USEDEP}] - || ( - dev-python/pillow[${PYTHON_USEDEP}] - media-gfx/imagemagick - ) - dev-python/rarfile[${PYTHON_USEDEP}] - dev-python/responses[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - media-libs/chromaprint[tools] - media-libs/flac - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-good:1.0 - media-sound/mp3val - media-sound/mp3gain - media-plugins/gst-plugins-libav:1.0 - media-video/ffmpeg:0[encode] - app-shells/bash-completion - ) - ')" - -PATCHES=( - "${FILESDIR}/${PV}-0001-Remove-test_completion.patch" - "${FILESDIR}/${PV}-sphinx-6.patch" - "${FILESDIR}/${PV}-mediafile-test.patch" - "${FILESDIR}/${PV}-unicode-test.patch" -) - -DOCS=( README.rst docs/changelog.rst ) - -distutils_enable_tests pytest - -python_prepare_all() { - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc ; then - sphinx-build -b html docs docs/build || die - fi -} - -python_install_all() { - distutils-r1_python_install_all - - doman man/* - use doc && local HTML_DOCS=( docs/build/html/. ) - einstalldocs - - ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die - newbashcomp "${T}/beet.bash" beet - insinto /usr/share/zsh/site-functions - newins "${WORKDIR}/${P}/extra/_beet" _beet - - optfeature "badfiles support" "media-libs/flac media-sound/mp3val" - optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]" - optfeature "discogs support" dev-python/python3-discogs-client - optfeature "ffmpeg support" media-video/ffmpeg[encode] - optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good" - optfeature "icu support" dev-db/sqlite[icu] - optfeature "lastfm support" dev-python/pylast - optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd2" - optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav" - optfeature "replaygain without gstreamer support" media-sound/mp3gain - optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick" - optfeature "webserver support" dev-python/flask - optfeature "webserver cors support" dev-python/flask-cors -} diff --git a/media-sound/beets/files/1.6.0-0001-Remove-test_completion.patch b/media-sound/beets/files/1.6.0-0001-Remove-test_completion.patch deleted file mode 100644 index e51f31c380dc..000000000000 --- a/media-sound/beets/files/1.6.0-0001-Remove-test_completion.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 8e37acd04af1b6d0723bf9d1992da49ee0155758 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]> -Date: Thu, 21 Oct 2021 23:16:45 +0200 -Subject: [PATCH] Remove test_completion - -Known issue: https://github.com/beetbox/beets/issues/1876 ---- - test/test_ui.py | 50 ------------------------------------------------- - 1 file changed, 50 deletions(-) - -diff --git a/test/test_ui.py b/test/test_ui.py -index 9804b0a1..5c321040 100644 ---- a/test/test_ui.py -+++ b/test/test_ui.py -@@ -1208,56 +1208,6 @@ class PluginTest(_common.TestCase, TestHelper): - self.run_command('test', lib=None) - - --@_common.slow_test() --class CompletionTest(_common.TestCase, TestHelper): -- def test_completion(self): -- # Load plugin commands -- config['pluginpath'] = [_common.PLUGINPATH] -- config['plugins'] = ['test'] -- -- # Do not load any other bash completion scripts on the system. -- env = dict(os.environ) -- env['BASH_COMPLETION_DIR'] = os.devnull -- env['BASH_COMPLETION_COMPAT_DIR'] = os.devnull -- -- # Open a `bash` process to run the tests in. We'll pipe in bash -- # commands via stdin. -- cmd = os.environ.get('BEETS_TEST_SHELL', '/bin/bash --norc').split() -- if not has_program(cmd[0]): -- self.skipTest('bash not available') -- tester = subprocess.Popen(cmd, stdin=subprocess.PIPE, -- stdout=subprocess.PIPE, env=env) -- -- # Load bash_completion library. -- for path in commands.BASH_COMPLETION_PATHS: -- if os.path.exists(util.syspath(path)): -- bash_completion = path -- break -- else: -- self.skipTest('bash-completion script not found') -- try: -- with open(util.syspath(bash_completion), 'rb') as f: -- tester.stdin.writelines(f) -- except OSError: -- self.skipTest('could not read bash-completion script') -- -- # Load completion script. -- self.io.install() -- self.run_command('completion', lib=None) -- completion_script = self.io.getoutput().encode('utf-8') -- self.io.restore() -- tester.stdin.writelines(completion_script.splitlines(True)) -- -- # Load test suite. -- test_script_name = os.path.join(_common.RSRC, b'test_completion.sh') -- with open(test_script_name, 'rb') as test_script_file: -- tester.stdin.writelines(test_script_file) -- out, err = tester.communicate() -- if tester.returncode != 0 or out != b'completion tests passed\n': -- print(out.decode('utf-8')) -- self.fail('test/test_completion.sh did not execute properly') -- -- - class CommonOptionsParserCliTest(unittest.TestCase, TestHelper): - """Test CommonOptionsParser and formatting LibModel formatting on 'list' - command. --- -2.32.0 - diff --git a/media-sound/beets/files/1.6.0-mediafile-test.patch b/media-sound/beets/files/1.6.0-mediafile-test.patch deleted file mode 100644 index 0feb8be7c98d..000000000000 --- a/media-sound/beets/files/1.6.0-mediafile-test.patch +++ /dev/null @@ -1,41 +0,0 @@ -used to work due to inconsistent mediafile implementation, but with -https://github.com/beetbox/mediafile/pull/64 (in mediafile >= 0.11.0) -list fields are None if non-existent, not the empty list - -Upstream-PR: https://github.com/beetbox/beets/pull/4593 - -diff --git a/test/test_embedart.py b/test/test_embedart.py -index 6b6d616..bc550a8 100644 ---- a/test/test_embedart.py -+++ b/test/test_embedart.py -@@ -81,7 +81,7 @@ class EmbedartCliTest(_common.TestCase, TestHelper): - self.run_command('embedart', '-f', self.small_artpath) - mediafile = MediaFile(syspath(item.path)) - # make sure that images array is empty (nothing embedded) -- self.assertEqual(len(mediafile.images), 0) -+ self.assertFalse(mediafile.images) - - def test_embed_art_from_file(self): - self._setup_data() -@@ -202,7 +202,7 @@ class EmbedartCliTest(_common.TestCase, TestHelper): - self.io.addinput('y') - self.run_command('clearart') - mediafile = MediaFile(syspath(item.path)) -- self.assertEqual(len(mediafile.images), 0) -+ self.assertFalse(mediafile.images) - - def test_clear_art_with_no_input(self): - self._setup_data() -diff --git a/test/test_zero.py b/test/test_zero.py -index c4c1769..b48367b 100644 ---- a/test/test_zero.py -+++ b/test/test_zero.py -@@ -103,7 +103,7 @@ class ZeroPluginTest(unittest.TestCase, TestHelper): - item.write() - - mf = MediaFile(syspath(path)) -- self.assertEqual(0, len(mf.images)) -+ self.assertFalse(mf.images) - - def test_auto_false(self): - self.config['zero']['fields'] = ['year'] diff --git a/media-sound/beets/files/1.6.0-sphinx-6.patch b/media-sound/beets/files/1.6.0-sphinx-6.patch deleted file mode 100644 index d946e93b76b8..000000000000 --- a/media-sound/beets/files/1.6.0-sphinx-6.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/889460 -https://github.com/beetbox/beets/commit/2106f471affd1dab35b4b26187b9c74d034528c5 - -From 2106f471affd1dab35b4b26187b9c74d034528c5 Mon Sep 17 00:00:00 2001 -From: Jack Wilsdon <[email protected]> -Date: Sat, 31 Dec 2022 14:23:34 +0000 -Subject: [PATCH] Add missing placeholders to extlinks captions - -Sphinx 6.0.0 changed extlinks to always require placeholders in link -captions. See https://github.com/sphinx-doc/sphinx/commit/93cf1a57d916a1ff96c8e8a0356d0256e40489ac ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -18,10 +18,10 @@ - - # External links to the bug tracker and other sites. - extlinks = { -- 'bug': ('https://github.com/beetbox/beets/issues/%s', '#'), -- 'user': ('https://github.com/%s', ''), -- 'pypi': ('https://pypi.org/project/%s/', ''), -- 'stdlib': ('https://docs.python.org/3/library/%s.html', ''), -+ 'bug': ('https://github.com/beetbox/beets/issues/%s', '#%s'), -+ 'user': ('https://github.com/%s', '%s'), -+ 'pypi': ('https://pypi.org/project/%s/', '%s'), -+ 'stdlib': ('https://docs.python.org/3/library/%s.html', '%s'), - } - - linkcheck_ignore = [ - diff --git a/media-sound/beets/files/1.6.0-unicode-test.patch b/media-sound/beets/files/1.6.0-unicode-test.patch deleted file mode 100644 index 8b69e09557c9..000000000000 --- a/media-sound/beets/files/1.6.0-unicode-test.patch +++ /dev/null @@ -1,47 +0,0 @@ -Unidecode 1.3.5 (a yanked PyPI version) changed the behavior of -Unidecode for some specific characters: - -> Remove trailing space in replacements for vulgar fractions. - -As luck would have it, our tests used the 1/2 character specifically to -test the behavior when these characters decoded to contain slashes. We -now pin a sufficiently recent version of Unidecode and adapt the tests -to match the new behavior. - -Upstream-Commit: https://github.com/beetbox/beets/commit/5ae1e0f3c8d3a450cb39f7933aa49bb78c2bc0d9 - -diff --git a/setup.py b/setup.py -index 264bb2e..69eb987 100755 ---- a/setup.py -+++ b/setup.py -@@ -85,7 +85,7 @@ setup( - }, - - install_requires=[ -- 'unidecode', -+ 'unidecode>=1.3.6', - 'musicbrainzngs>=0.4', - 'pyyaml', - 'mediafile>=0.2.0', -diff --git a/test/test_library.py b/test/test_library.py -index 667d92c..b1cb579 100644 ---- a/test/test_library.py -+++ b/test/test_library.py -@@ -441,7 +441,7 @@ class DestinationTest(_common.TestCase): - self.lib.directory = b'lib' - self.lib.path_formats = [('default', '$title')] - self.i.title = 'ab\xa2\xbdd' -- self.assertEqual(self.i.destination(), np('lib/abC_ 1_2 d')) -+ self.assertEqual(self.i.destination(), np('lib/abC_ 1_2d')) - - def test_destination_with_replacements(self): - self.lib.directory = b'base' -@@ -637,7 +637,7 @@ class DestinationFunctionTest(_common.TestCase, PathFormattingMixin): - - def test_asciify_variable(self): - self._setf('%asciify{ab\xa2\xbdd}') -- self._assert_dest(b'/base/abC_ 1_2 d') -+ self._assert_dest(b'/base/abC_ 1_2d') - - def test_left_variable(self): - self._setf('%left{$title, 3}')
