From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33DCA15817D for ; Mon, 3 Jun 2024 05:06:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57F23E2AE5; Mon, 3 Jun 2024 05:06:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1492E2AE5 for ; Mon, 3 Jun 2024 05:06:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABF7F340CBB for ; Mon, 3 Jun 2024 05:06:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4FAF1C04 for ; Mon, 3 Jun 2024 05:06:25 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1717390979.1cf2e193f9cc134876eb77153415d96b1b9bf6e9.kangie@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.7.0_pre20240501.ebuild media-sound/beets/beets-9999.ebuild X-VCS-Directories: media-sound/beets/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 1cf2e193f9cc134876eb77153415d96b1b9bf6e9 X-VCS-Branch: master Date: Mon, 3 Jun 2024 05:06:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8d9862fa-f47a-440b-b507-20da28d1a93e X-Archives-Hash: 67d2de180e2beb719d2af7a18582323a commit: 1cf2e193f9cc134876eb77153415d96b1b9bf6e9 Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 3 04:48:04 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 3 05:02:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf2e193 media-sound/beets: add missing USE=doc dependencies Closes: https://bugs.gentoo.org/932479 Signed-off-by: Matt Jolly gentoo.org> media-sound/beets/beets-1.7.0_pre20240501.ebuild | 3 ++- media-sound/beets/beets-9999.ebuild | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/media-sound/beets/beets-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild index ea51e978cc1d..71c42d29cfe8 100644 --- a/media-sound/beets/beets-1.7.0_pre20240501.ebuild +++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild @@ -57,6 +57,7 @@ DEPEND=" BDEPEND=" doc? ( dev-python/sphinx + dev-python/pydata-sphinx-theme ) $(python_gen_cond_dep ' test? ( @@ -124,7 +125,7 @@ python_prepare_all() { python_compile_all() { if use doc ; then - sphinx-build -b html docs docs/build || die + sphinx-build -b html docs docs/build/html || die fi # If building from VCS sources we need to generate manpages, then copy them to ${S}/man # We could install mans from the sphinx build path, but to be consistent with pypi for src_install diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild index 5dbc70f0225d..00a1c997e652 100644 --- a/media-sound/beets/beets-9999.ebuild +++ b/media-sound/beets/beets-9999.ebuild @@ -55,6 +55,7 @@ DEPEND=" BDEPEND=" doc? ( dev-python/sphinx + dev-python/pydata-sphinx-theme ) $(python_gen_cond_dep ' test? ( @@ -110,7 +111,7 @@ src_prepare() { sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg" # Update the version if we're not building from pypy; it's probably a _pre or live ebuild. if [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then - sed -i -e "s/version=\".*\"/version=\"${PV}\"/" setup.py || die "Failed to update version in VCS sources" + sed -i -e "s/version='.*'/version='${PV}'/" setup.py || die "Failed to update version in VCS sources" sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py fi default @@ -122,7 +123,7 @@ python_prepare_all() { python_compile_all() { if use doc ; then - sphinx-build -b html docs docs/build || die + sphinx-build -b html docs docs/build/html || die fi # If building from VCS sources we need to generate manpages, then copy them to ${S}/man # We could install mans from the sphinx build path, but to be consistent with pypi for src_install