gentoo auto-resync : 13:01:2023 - 11:48:35

3 files changed, 32 insertions, 2 deletions

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 5048155d283a..4095e016083a 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -4,11 +4,12 @@ AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db5
 AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd
 AUX 1.5.0-0001-Remove-test_completion.patch 2878 BLAKE2B 1a8bedd5efd9ae823f632124b4f2a273f2ed1576003ca69f689cc4e995724d691fba2018d6f3fe1fc71b0d2c5ca6b3b21380f655f0b997107abda218d34c45f7 SHA512 9b3c8f352493dd72f9206824722c2900c6877223c14726346392a4f2f861b4b3d0499f8539ea6be2d3564a8cb4218cc560d3ce4e47bcf5b1854310a1bd30337d
 AUX 1.6.0-0001-Remove-test_completion.patch 2874 BLAKE2B d1a748712d118783c39b1e7d082b1ca5fe6edb26378a26e0f25a70d07129f009ba27a7fee1ec4af5f6515744e0ccce0d4d46779105c3fd5f2e18a00489b8b354 SHA512 c3f471adf8e86bf7ecad99af66213a229b0afa1431f480e3ae48bb87304fc5c39ba313e3fd9fd6b7e3382c792bd8c266f61bf1e56368f9dd28ecbf5bd3547ef2
+AUX 1.6.0-sphinx-6.patch 1114 BLAKE2B f37fe23ea86e47ed6eaf5705ae569103d3ae3b5141b9c80c22b30c650a499f915951e5db3e420e36d2829e3508d3e75729391a5de90cfa809271361692c4f485 SHA512 fe2290aec4d6356d4bd2690bd716370e45ae45f98845fb42adda9fab160f306c076f31fd30971f69431b7507917e201d82b494a49d34bf4549024b4df701a83a
 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
 EBUILD beets-1.4.9-r6.ebuild 4394 BLAKE2B 875d18123f6494160f550ee63a5deeaea8166afd891de2265d2e6236144676a8c11e273206fd8cec3cd1a21c4efdc7a3488cbcb5c2451c5187807cea0cb5910c SHA512 b722b45ead4f00788d5b2fbae80af7f46dbdf6a94fb7f55424cdb7252bc04ab85aac99238055f30c74adbb5c9c0e40b2057ea90b10293e379bdede302cb8b29a
 EBUILD beets-1.5.0-r2.ebuild 3792 BLAKE2B 1d710f86dd553e1ce40156604b0cb704a60e8279af09d0e54d2e56c6ded3a43e8cb68e234b6a71853c4d4e60c7d42c142cdfe4ed84c89270c73697311cea8865 SHA512 467079e422111da50a1a9435d43ccb4d4163905437ca2ecc170420c511fa92eed109791a82e9c5efb4298b66e929b1467677ccee0e15d714ed7f3b43ebf803f9
-EBUILD beets-1.6.0.ebuild 3796 BLAKE2B 37aca00d7ca9a1d6398a0ae0afcc25c2d9d58df17f8bf2dd547e0b814dfe821d04b9fd3c388e968a670195918ff26d33508267b06d2b74292242fc1539bdc36e SHA512 4a685c47ed65ac4105b8f633c48e8fb96a6e4cac5c59d54b529e3db5c0258896e18285e5e45c7ba79ce52c9f829b2ab5ef1ddd25bccf52f8f07cfd65c230aa04
+EBUILD beets-1.6.0.ebuild 3832 BLAKE2B 3b2160e23aab1fb3b7b17e39180beff611d13322ca23b46af4e1fe2094352902e65710612cbe5b5e3304020791a1371b37f57e27629facc39eebb0190f7ba1f4 SHA512 794627b40b2cacba39998f923776b5b6ee11b38b6ed4d2774d9dd35220d7b75926f35842c676dde768f872d210fa4c9e27d0aceebd0753b81f0097cdfe2f7dc7
 EBUILD beets-9999.ebuild 3729 BLAKE2B 879a440fdb509328b53bdacc43d5e9754a55f165bbf8582a0356111834f8fd974b9252cbd9993bb1f23cf99ef5fcc9f8f78ae96449c5f12c8ad84b2ab601562a SHA512 9bfda12cbc18d861815aacf1d99c206ccf3f07f65de235192fd9d5f74ad2ef6c20627566a56bb28091d3dbfb6c644e3c8dbc3da7378e3c964a6914782a22dd56
 MISC metadata.xml 1782 BLAKE2B d06aa5a90768970a9327f134c1314896d888d4c4e78eca01665809a650af67890753698efcc18fc3f57e128a9443f283b4b11b613f0c04be1772e218d789f1d4 SHA512 7d8dc8ca0c7ed4bd8438736ac7f2bc003b07c1c2899e7e0b3d97e89113ff565049cded486c14be9b2026d7446318cfdc0cf4f9a61731c66e61ab7b6c0f9c5dca
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 <jack.wilsdon@gmail.com>
+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 = [
+