diff options
Diffstat (limited to 'media-sound/beets')
| -rw-r--r-- | media-sound/beets/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/beets/beets-1.4.9-r6.ebuild (renamed from media-sound/beets/beets-1.4.9-r5.ebuild) | 1 | ||||
| -rw-r--r-- | media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch | 134 |
3 files changed, 137 insertions, 1 deletions
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest index c4011bc1ddef..ab8771b7522f 100644 --- a/media-sound/beets/Manifest +++ b/media-sound/beets/Manifest @@ -1,7 +1,8 @@ AUX 1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch 2123 BLAKE2B fea2eb593c8be68d3cd336a4bf56346c777ba651fdb98cfe6f9063a087428ce2749793ec61f109b2fea40dd8cc44ceb19b97d308c4c69c267b2993836b2b7ae6 SHA512 bf3ef299d66e7db79fcc0f7c4cd5abfbb041e6cea4bf06f02e498d3edf7495cd92f01191865af6a5bb40b064f0659d5cf80df7a42d14976e3e963ab94e113bdd AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4c3146b0e6fe343d4a437dfdb13aa60e0bbbf59f2959fee39f4d5bdb620fe57670e01a0963ad9eea3cf0309b3ea516e0931e9383c19 SHA512 2f6b5636ad3a16e70438fd2c1b62952416225dcc9acca686b1dc19ba4c2c5dbed4807f3f597e212d23ddf12de0fb0f315729da9ca86fbbc6766f4840dc83a524 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009 +AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a -EBUILD beets-1.4.9-r5.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955 +EBUILD beets-1.4.9-r6.ebuild 4532 BLAKE2B 4ade846a90fbe3438a86c7a0c4794e34bf231ccd4c2dd3ef3f0a8978edc6dae17fe23f8bde7bb7e1f738086f10b62b521f881c8ad2601c7c1703918e59d35323 SHA512 db10f1e25109ad3c953ae6d71db8db80733145dddafb782a3bb79bbb7c6c26fccb281dcf565ad131b69d2ef46721d113c0e08a48f37a4ca7aaee6c1a5fb4d99f EBUILD beets-9999.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955 MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588 diff --git a/media-sound/beets/beets-1.4.9-r5.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild index cc6a223082b5..4fd12ebc72c4 100644 --- a/media-sound/beets/beets-1.4.9-r5.ebuild +++ b/media-sound/beets/beets-1.4.9-r6.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch" "${FILESDIR}/${PV}-0002-Disable-test_completion.patch" "${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch" + "${FILESDIR}/${PV}-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch" ) DOCS=( README.rst docs/changelog.rst ) diff --git a/media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch b/media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch new file mode 100644 index 000000000000..f7eb3d26b758 --- /dev/null +++ b/media-sound/beets/files/1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch @@ -0,0 +1,134 @@ +From 0da62a5ed7aa5fcfc8501a06f26c3af6afa8bc52 Mon Sep 17 00:00:00 2001 +From: George Rawlinson <george@rawlinson.net.nz> +Date: Thu, 25 Feb 2021 20:00:34 +1300 +Subject: [PATCH] Fix #3608: Replace discogs-client with python3-discogs-client + +discogs-client has been deprecated since June 2020, the replacement +is actively developed by the community and does not have any breaking +API changes. + +Signed-off-by: George Rawlinson <george@rawlinson.net.nz> +--- + beetsplug/discogs.py | 2 +- + docs/plugins/discogs.rst | 8 +++---- + setup.py | 50 +++++++++++++++++++++++++++------------- + 4 files changed, 41 insertions(+), 21 deletions(-) + +diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py +index 5a2bf57e..78d94eb1 100644 +--- a/beetsplug/discogs.py ++++ b/beetsplug/discogs.py +@@ -14,7 +14,7 @@ + # included in all copies or substantial portions of the Software. + + """Adds Discogs album search support to the autotagger. Requires the +-discogs-client library. ++python3-discogs-client library. + """ + from __future__ import division, absolute_import, print_function + + For plugin developers: + +diff --git a/docs/plugins/discogs.rst b/docs/plugins/discogs.rst +index a02b3459..f8406fd2 100644 +--- a/docs/plugins/discogs.rst ++++ b/docs/plugins/discogs.rst +@@ -10,9 +10,9 @@ Installation + ------------ + + To use the ``discogs`` plugin, first enable it in your configuration (see +-:ref:`using-plugins`). Then, install the `discogs-client`_ library by typing:: ++:ref:`using-plugins`). Then, install the `python3-discogs-client`_ library by typing:: + +- pip install discogs-client ++ pip install python3-discogs-client + + You will also need to register for a `Discogs`_ account, and provide + authentication credentials via a personal access token or an OAuth2 +@@ -36,7 +36,7 @@ Authentication via Personal Access Token + + As an alternative to OAuth, you can get a token from Discogs and add it to + your configuration. +-To get a personal access token (called a "user token" in the `discogs-client`_ ++To get a personal access token (called a "user token" in the `python3-discogs-client`_ + documentation), login to `Discogs`_, and visit the + `Developer settings page + <https://www.discogs.com/settings/developers>`_. Press the ``Generate new +@@ -57,4 +57,4 @@ Here are two things you can try: + * Make sure that your system clock is accurate. The Discogs servers can reject + your request if your clock is too out of sync. + +-.. _discogs-client: https://github.com/discogs/discogs_client ++.. _python3-discogs-client: https://github.com/joalla/discogs_client +diff --git a/setup.py b/setup.py +index 79278f8b..768c40a0 100755 +--- a/setup.py ++++ b/setup.py +@@ -107,30 +107,48 @@ setup( + ['colorama'] if (sys.platform == 'win32') else [] + ), + +- tests_require=[ +- 'beautifulsoup4', +- 'flask', +- 'mock', +- 'pylast', +- 'rarfile', +- 'responses', +- 'pyxdg', +- 'python-mpd2', +- 'discogs-client' +- ] + ( +- # Tests for the thumbnails plugin need pathlib on Python 2 too. +- ['pathlib'] if (sys.version_info < (3, 4, 0)) else [] +- ), +- + # Plugin (optional) dependencies: + extras_require={ ++ 'test': [ ++ 'beautifulsoup4', ++ 'coverage', ++ 'flask', ++ 'mock', ++ 'pylast', ++ 'pytest', ++ 'python-mpd2', ++ 'pyxdg', ++ 'responses>=0.3.0', ++ 'requests_oauthlib', ++ 'reflink', ++ ] + ( ++ # Tests for the thumbnails plugin need pathlib on Python 2 too. ++ ['pathlib'] if (sys.version_info < (3, 4, 0)) else [] ++ ) + [ ++ 'rarfile<4' if sys.version_info < (3, 6, 0) else 'rarfile', ++ ] + [ ++ 'discogs-client' if (sys.version_info < (3, 0, 0)) ++ else 'python3-discogs-client' ++ ], ++ 'lint': [ ++ 'flake8', ++ 'flake8-coding', ++ 'flake8-docstrings', ++ 'flake8-future-import', ++ 'pep8-naming', ++ ], ++ ++ # Plugin (optional) dependencies: + 'absubmit': ['requests'], + 'fetchart': ['requests', 'Pillow'], + 'embedart': ['Pillow'], + 'embyupdate': ['requests'], + 'chroma': ['pyacoustid'], + 'gmusic': ['gmusicapi'], +- 'discogs': ['discogs-client>=2.2.1'], ++ 'discogs': ( ++ ['discogs-client' if (sys.version_info < (3, 0, 0)) ++ else 'python3-discogs-client'] ++ ), + 'beatport': ['requests-oauthlib>=0.6.1'], + 'kodiupdate': ['requests'], + 'lastgenre': ['pylast'], +-- +2.26.3 + |