[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/, media-sound/beets/files/

2024-06-02 Thread Matt Jolly
commit: 29d3ec64942c8d20ca64b0d49c7f9032d0c5bf08
Author: Matt Jolly  gentoo  org>
AuthorDate: Mon Jun  3 04:52:16 2024 +
Commit: Matt Jolly  gentoo  org>
CommitDate: Mon Jun  3 05:05:00 2024 +
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  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..
--- 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} == "" ]]; 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]
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/, media-sound/beets/files/

2023-02-22 Thread Sam James
commit: 9d611ed29750cf1035eb1a77f5097c69bb0573d5
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed Feb 22 15:16:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 15:59:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d611ed2

media-sound/beets: Fix tests

Few tests were failing because of changes in dependencies, namely in
dev-python/mediafile and dev-python/unidecode.

Closes: https://bugs.gentoo.org/876427
Closes: https://bugs.gentoo.org/895862
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 media-sound/beets/beets-1.6.0.ebuild   |  2 +
 media-sound/beets/files/1.6.0-mediafile-test.patch | 41 +++
 media-sound/beets/files/1.6.0-unicode-test.patch   | 47 ++
 3 files changed, 90 insertions(+)

diff --git a/media-sound/beets/beets-1.6.0.ebuild 
b/media-sound/beets/beets-1.6.0.ebuild
index 4fc0ecd49e53..d27548ed87e2 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -85,6 +85,8 @@ BDEPEND="
 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 )

diff --git a/media-sound/beets/files/1.6.0-mediafile-test.patch 
b/media-sound/beets/files/1.6.0-mediafile-test.patch
new file mode 100644
index ..0feb8be7c98d
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-mediafile-test.patch
@@ -0,0 +1,41 @@
+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-unicode-test.patch 
b/media-sound/beets/files/1.6.0-unicode-test.patch
new file mode 100644
index ..8b69e09557c9
--- /dev/null
+++ b/media-sound/beets/files/1.6.0-unicode-test.patch
@@ -0,0 +1,47 @@
+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):
+ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/, media-sound/beets/files/

2021-12-01 Thread Sam James
commit: dd4c5419fe970eea708ddc18de1c451c83e2
Author: Arsen Arsenović  aarsen  me>
AuthorDate: Sun Nov 28 23:31:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 21:33:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4c541c

media-sound/beets: bump to 1.6.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Arsen Arsenović  aarsen.me>
Closes: https://github.com/gentoo/gentoo/pull/23111
Signed-off-by: Sam James  gentoo.org>

 media-sound/beets/Manifest |   1 +
 media-sound/beets/beets-1.6.0.ebuild   | 125 +
 .../files/1.6.0-0001-Remove-test_completion.patch  |  74 
 3 files changed, 200 insertions(+)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 2ef455a86dc7..50daf64c1bd6 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,2 +1,3 @@
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 
2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b
 SHA512 
616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
 DIST beets-1.5.0.tar.gz 1694845 BLAKE2B 
e4a4ad880edcc396170bca9e7d04548f22a55eac22481d2babca0d2ca71237ed0509bf9be9af12343b0d1b555e9726446e5d61e637312a4808eece5ce0302f33
 SHA512 
447b01dc750a69d0a33d271774f3bd3b997a203d80c220c1a961f9a8e30420d263b1e2a4682d25ff7b02e1e85155f42186cb0d3bf27ebc8c2777f68e197d4018
+DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 
7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf
 SHA512 
b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc

diff --git a/media-sound/beets/beets-1.6.0.ebuild 
b/media-sound/beets/beets-1.6.0.ebuild
new file mode 100644
index ..77fc9c07cd2b
--- /dev/null
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/beetbox/beets.git;
+   inherit git-r3
+else
+   MY_PV=${PV/_beta/-beta.}
+   MY_P=${PN}-${MY_PV}
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive 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/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/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-mpd[${PYTHON_USEDEP}]
+   dev-python/pyxdg[${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
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/, media-sound/beets/files/

2021-05-31 Thread Sam James
commit: 3ebe00e69103aa9840a84123c008ceec779e947c
Author: Guillaume Seren  gmail  com>
AuthorDate: Wed May 26 11:12:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  1 00:27:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebe00e6

media-sound/beets: Backport patch for #790215

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Closes: https://bugs.gentoo.org/790215
Signed-off-by: Guillaume Seren  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-sound/beets/beets-1.4.9-r6.ebuild| 135 +
 ...place-discogs-client-with-python3-discogs.patch | 134 
 2 files changed, 269 insertions(+)

diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild 
b/media-sound/beets/beets-1.4.9-r6.ebuild
new file mode 100644
index 000..4fd12ebc72c
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/beetbox/beets.git;
+   inherit git-r3
+else
+   MY_PV=${PV/_beta/-beta.}
+   MY_P=${PN}-${MY_PV}
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive 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_MULTI_USEDEP}]
+   dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+   >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+   >=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+   dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+   dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+   dev-python/requests[${PYTHON_MULTI_USEDEP}]
+   >=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+   dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+   ')"
+DEPEND="
+   ${RDEPEND}
+"
+BDEPEND="
+   doc? (
+   dev-python/sphinx
+   )
+   $(python_gen_cond_dep '
+   test? (
+   dev-db/sqlite[icu]
+   dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+   dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+   dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+   dev-python/flask[${PYTHON_MULTI_USEDEP}]
+   dev-python/mock[${PYTHON_MULTI_USEDEP}]
+   dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+   dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+   dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+   dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+   || (
+   dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+   media-gfx/imagemagick
+   )
+   dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+   dev-python/responses[${PYTHON_MULTI_USEDEP}]
+   dev-python/wheel[${PYTHON_MULTI_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]
+   )
+   ')"
+
+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 )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+
+   # Tests that need network
+   rm test/test_art.py || die "Failed to remove test_art.py"
+   rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+   rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+   rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+   rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+   # Not 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/, media-sound/beets/files/

2019-12-07 Thread Andreas Sturmlechner
commit: 8d5b730e870a710dea0626c3c94b2c118bde8754
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  7 18:45:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  7 22:51:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5b730e

media-sound/beets: Drop python3_5 support

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/beets/beets-1.4.9-r1.ebuild| 144 +
 media-sound/beets/files/beets-1.4.9-py37.patch |  38 +++
 2 files changed, 182 insertions(+)

diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild 
b/media-sound/beets/beets-1.4.9-r1.ebuild
new file mode 100644
index 000..a340e1c3ed4
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Media library management system for obsessive-compulsive music 
geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/;
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd 
replaygain test thumbnail webserver"
+
+BDEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="
+   >=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+   dev-python/munkres[${PYTHON_USEDEP}]
+   >=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+   >=dev-python/six-1.9[${PYTHON_USEDEP}]
+   dev-python/unidecode[${PYTHON_USEDEP}]
+   >=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+   virtual/python-enum34[${PYTHON_USEDEP}]
+   badfiles? (
+   media-libs/flac
+   media-sound/mp3val
+   )
+   chromaprint? (
+   dev-python/pyacoustid[${PYTHON_USEDEP}]
+   media-libs/chromaprint[tools]
+   )
+   discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+   ffmpeg? ( media-video/ffmpeg:0[encode] )
+   gstreamer? (
+   media-libs/gst-plugins-good:1.0
+   media-libs/gst-plugins-bad:1.0
+   )
+   icu? ( dev-db/sqlite[icu] )
+   lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+   mpd? (
+   dev-python/bluelet[${PYTHON_USEDEP}]
+   dev-python/python-mpd[${PYTHON_USEDEP}]
+   )
+   replaygain? (
+   gstreamer? (
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   media-plugins/gst-plugins-libav:1.0
+   )
+   !gstreamer? ( media-sound/mp3gain )
+   )
+   thumbnail? (
+   dev-python/pyxdg[${PYTHON_USEDEP}]
+   virtual/python-pathlib[${PYTHON_USEDEP}]
+   || (
+   dev-python/pillow[${PYTHON_USEDEP}]
+   media-gfx/imagemagick
+   )
+   )
+   webserver? (
+   dev-python/flask[${PYTHON_USEDEP}]
+   dev-python/flask-cors[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+PATCHES=( "${FILESDIR}/${P}-py37.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+   rm_use_plugins() {
+   [[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+   local use=${1}
+   local plugins=${use}
+   use ${use} && return
+   einfo "no ${use}:"
+   [[ $# -gt 1 ]] && plugins="${@:2}"
+   for arg in ${plugins[@]}; do
+   einfo "  removing ${arg}"
+   if [[ -e "beetsplug/${arg}.py" ]]; then
+   rm beetsplug/${arg}.py || die "Unable to remove 
${arg} plugin"
+   fi
+   if [[ -d "beetsplug/${arg}" ]]; then
+   rm -r beetsplug/${arg} || die "Unable to remove 
${arg} plugin"
+   fi
+   sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+   die "Unable to disable ${arg} plugin "
+   done
+   }
+
+   distutils-r1_python_prepare_all
+
+   rm_use_plugins chromaprint chroma
+   rm_use_plugins ffmpeg convert
+   rm_use_plugins icu loadext
+   rm_use_plugins lastfm lastgenre lastimport
+   rm_use_plugins mpd bpd mpdstats
+   rm_use_plugins webserver web
+   rm_use_plugins thumbnail thumbnails
+
+   # remove plugins that do not have appropriate dependencies installed
+   for