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 AFFC515800F for ; Fri, 13 Jan 2023 10:17:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2E14E07E2; Fri, 13 Jan 2023 10:17:50 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7BBCE07E2 for ; Fri, 13 Jan 2023 10:17:50 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0BFB340C1C for ; Fri, 13 Jan 2023 10:17:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F4EE82C for ; Fri, 13 Jan 2023 10:17:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673605056.a3634bca07cf0209ddaed3c88f9ddc06af60046b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/beets/beets-1.6.0.ebuild media-sound/beets/files/1.6.0-sphinx-6.patch X-VCS-Directories: media-sound/beets/ media-sound/beets/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a3634bca07cf0209ddaed3c88f9ddc06af60046b X-VCS-Branch: master Date: Fri, 13 Jan 2023 10:17:48 +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: 2481b0bf-e85b-4edd-ae59-bcb067bf7890 X-Archives-Hash: aa210134cced9bff0d00eba09adc2c66 commit: a3634bca07cf0209ddaed3c88f9ddc06af60046b Author: Sam James gentoo org> AuthorDate: Fri Jan 13 10:13:48 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 13 10:17:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3634bca media-sound/beets: fix build w/ sphinx 6 Closes: https://bugs.gentoo.org/889460 Signed-off-by: Sam James gentoo.org> media-sound/beets/beets-1.6.0.ebuild | 3 ++- media-sound/beets/files/1.6.0-sphinx-6.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild index 4550e6da0e11..e4ae0a196374 100644 --- a/media-sound/beets/beets-1.6.0.ebuild +++ b/media-sound/beets/beets-1.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -84,6 +84,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PV}-0001-Remove-test_completion.patch" + "${FILESDIR}/${PV}-sphinx-6.patch" ) DOCS=( README.rst docs/changelog.rst ) diff --git a/media-sound/beets/files/1.6.0-sphinx-6.patch b/media-sound/beets/files/1.6.0-sphinx-6.patch new file mode 100644 index 000000000000..d946e93b76b8 --- /dev/null +++ b/media-sound/beets/files/1.6.0-sphinx-6.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/889460 +https://github.com/beetbox/beets/commit/2106f471affd1dab35b4b26187b9c74d034528c5 + +From 2106f471affd1dab35b4b26187b9c74d034528c5 Mon Sep 17 00:00:00 2001 +From: Jack Wilsdon +Date: Sat, 31 Dec 2022 14:23:34 +0000 +Subject: [PATCH] Add missing placeholders to extlinks captions + +Sphinx 6.0.0 changed extlinks to always require placeholders in link +captions. See https://github.com/sphinx-doc/sphinx/commit/93cf1a57d916a1ff96c8e8a0356d0256e40489ac +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -18,10 +18,10 @@ + + # External links to the bug tracker and other sites. + extlinks = { +- 'bug': ('https://github.com/beetbox/beets/issues/%s', '#'), +- 'user': ('https://github.com/%s', ''), +- 'pypi': ('https://pypi.org/project/%s/', ''), +- 'stdlib': ('https://docs.python.org/3/library/%s.html', ''), ++ 'bug': ('https://github.com/beetbox/beets/issues/%s', '#%s'), ++ 'user': ('https://github.com/%s', '%s'), ++ 'pypi': ('https://pypi.org/project/%s/', '%s'), ++ 'stdlib': ('https://docs.python.org/3/library/%s.html', '%s'), + } + + linkcheck_ignore = [ +