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

[Sam James]

commit:     11c5753ba80a1fe7a362aece48c22a7593f8dafb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 08:45:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 08:45:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c5753b

media-sound/beets: fix dependencies

Closes: https://bugs.gentoo.org/820935
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../beets/{beets-1.5.0.ebuild => beets-1.5.0-r1.ebuild}     |  6 +++---
 media-sound/beets/beets-9999.ebuild                         | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/media-sound/beets/beets-1.5.0.ebuild b/media-sound/beets/beets-1.5.0-r1.ebuild
similarity index 96%
rename from media-sound/beets/beets-1.5.0.ebuild
rename to media-sound/beets/beets-1.5.0-r1.ebuild
index aa73a47719c..ae9ee9e9119 100644
--- a/media-sound/beets/beets-1.5.0.ebuild
+++ b/media-sound/beets/beets-1.5.0-r1.ebuild
@@ -67,6 +67,9 @@ BDEPEND="
 			dev-python/rarfile[${PYTHON_USEDEP}]
 			dev-python/responses[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			dev-python/confuse[${PYTHON_USEDEP}]
+			dev-python/mediafile[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
@@ -76,9 +79,6 @@ BDEPEND="
 			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
 			app-shells/bash-completion
-			dev-python/reflink
-			dev-python/confuse
-			dev-python/mediafile
 		)
 	')"
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 7d299524043..9d0e8ddd174 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -44,7 +44,9 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	dev-python/sphinx
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
@@ -65,6 +67,9 @@ BDEPEND="
 			dev-python/rarfile[${PYTHON_USEDEP}]
 			dev-python/responses[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			dev-python/confuse[${PYTHON_USEDEP}]
+			dev-python/mediafile[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
@@ -74,9 +79,6 @@ BDEPEND="
 			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
 			app-shells/bash-completion
-			dev-python/reflink
-			dev-python/confuse
-			dev-python/mediafile
 		)
 	')"
 
@@ -89,14 +91,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	emake -C docs man
 	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman docs/_build/man/*
+	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs