From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1242680-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id DD9EE13835A
	for <garchives@archives.gentoo.org>; Mon, 18 Jan 2021 12:27:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2767EE07F1;
	Mon, 18 Jan 2021 12:27:24 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 09A95E07F1
	for <gentoo-commits@lists.gentoo.org>; Mon, 18 Jan 2021 12:27:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E4DDA340FEC
	for <gentoo-commits@lists.gentoo.org>; Mon, 18 Jan 2021 12:27:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FC364A1
	for <gentoo-commits@lists.gentoo.org>; Mon, 18 Jan 2021 12:27:18 +0000 (UTC)
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" <juippis@gentoo.org>
Message-ID: <1610972825.fbddb8ec8d54d2e1ec001d97f3e52c81deb7043f.juippis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/beets/beets-1.4.9-r3.ebuild media-sound/beets/beets-9999.ebuild
X-VCS-Directories: media-sound/beets/
X-VCS-Committer: juippis
X-VCS-Committer-Name: Joonas Niilola
X-VCS-Revision: fbddb8ec8d54d2e1ec001d97f3e52c81deb7043f
X-VCS-Branch: master
Date: Mon, 18 Jan 2021 12:27:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8258af38-24ac-4c0b-a0c8-8d64c929ebc5
X-Archives-Hash: b6f7d74261a9852c629b912a3aa5a9c0

commit:     fbddb8ec8d54d2e1ec001d97f3e52c81deb7043f
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 19:45:36 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:27:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbddb8ec

media-sound/beets: Use pre-builded man page

Closes: https://bugs.gentoo.org/758647
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16046
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r3.ebuild | 7 ++++---
 media-sound/beets/beets-9999.ebuild     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r3.ebuild b/media-sound/beets/beets-1.4.9-r3.ebuild
index fe7c12adf3a..d07f7f6efe2 100644
--- a/media-sound/beets/beets-1.4.9-r3.ebuild
+++ b/media-sound/beets/beets-1.4.9-r3.ebuild
@@ -92,7 +92,9 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	dev-python/sphinx
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
@@ -143,14 +145,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
 	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
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index fe7c12adf3a..d07f7f6efe2 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -92,7 +92,9 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	dev-python/sphinx
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
@@ -143,14 +145,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
 	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