gentoo auto-resync : 09:06:2024 - 00:08:13

4 files changed, 2 insertions, 108 deletions

diff --git a/dev-python/sphinxcontrib-plantuml/Manifest b/dev-python/sphinxcontrib-plantuml/Manifest
index cb67c95c0ff7..5c0a7de15ad7 100644
--- a/dev-python/sphinxcontrib-plantuml/Manifest
+++ b/dev-python/sphinxcontrib-plantuml/Manifest
@@ -1,6 +1,3 @@
-AUX sphinxcontrib-plantuml-0.29-pytest-8.patch 1344 BLAKE2B ff992e7101e393cd230952958d4ad4c66bff4676971030690d66317778de72a2df4813bd9260e8466df924b20b9cb8532691a98b1a91aebc8d5f1bc257fbbcd7 SHA512 d12d62fdb4800e7a9538ea2a7235bca8e0d94a1c0144d633a7bea940a54190581c04116a9c2615b21c19b5318dd0a7db21f8f9c05bc0fc3532ad5c8e4397f8b6
-DIST sphinxcontrib-plantuml-0.29.gh.tar.gz 19376 BLAKE2B c410be6af6364e347dd1b8e782e55d9cea1c799dc3e2d5055c893b37e437c5e300cafc79e70947447979fe4b11d97fab7cddd6e0894654e274cd05cb5d4abba3 SHA512 9bcec86db5956dd9cbad097ad52b5dc915598c3324662491229268689c3c57c5ce680b38e38ff3360a109f3fd50753c92252ecaf928b124f9a515f52d1da93b4
 DIST sphinxcontrib-plantuml-0.30.gh.tar.gz 19378 BLAKE2B 1f146b59184acec99ff4320199943b2193c3e4c5f5d1f62c6741fb9bbd9802d7c3955bfad786bf7dd4b937b99b974f94d753212c95e7940ab066a9d6ee02af9a SHA512 e85c6332d26d09531c961f8026c72cd82ff4a31700a38cb8285f24d942340700012c08cc1f87a86389b71bfc5d32164586407b5c6777cc94d4d0022c9872ee3a
-EBUILD sphinxcontrib-plantuml-0.29.ebuild 1202 BLAKE2B 6476e9ea59b18c96633728140d8b4d54b614837d19d5a62b96e4d8e38f19d7cacb5f1210ed0d7d38fdb5d52d96146541c05ae05f0d9322c54863b8defe9aeed3 SHA512 6c02f117581681028d3440d26003d833fdc3416693f8c94f4c25d78fdf65178b0e317bd50bd37a6a65f49d485f733ef4996f7ec57b0dec592c5c199b741beab2
-EBUILD sphinxcontrib-plantuml-0.30.ebuild 1062 BLAKE2B c9b6a9ef0eca05a884c78b3effc86fe7a0f40647f4d95547ef7dfd2dc35b18c5bd21db43bd94c8fae17086b2112abe12692d798616b920560578143ee5c9efe7 SHA512 c5bb40b5f8ef46e009e9fec46146da53f689a89b3c966bbbd31a5f46a22349b0b81d722890639f708e4deee0a73ec1d3fd5280086a19d811796b129363573d3d
+EBUILD sphinxcontrib-plantuml-0.30.ebuild 1060 BLAKE2B 487e0708fc2ceac33049334349049fd8720a49d31beb8eb707f58e526c092ef3e7dc8f94294a27c407065fe65586ae60ac56db606e4f13a267e7a3f3b9991403 SHA512 59d91a68d869e1cbe9d5f1f96b9485c59dbb1add745070c6d8b819b4f361445ba87517c0234b2fad0af124fbd42f7de432f91f475973614dab5f11762ec73efd
 MISC metadata.xml 419 BLAKE2B 05ba888453b1a19e83a8d21a5b0cc2a5a24482434b44c0f3bd4c75c99004523f6397a7a32811a336c15449ea86f1736e5a940d240d19f3956a176fce3881378d SHA512 6d8c4c646e7d84771a7ac7889650c06a0efcaa708d5e009df323f4d8ee591c75d864811ba10dde72b84f40359092302225a93d8de374da8d52033163356d6f46
diff --git a/dev-python/sphinxcontrib-plantuml/files/sphinxcontrib-plantuml-0.29-pytest-8.patch b/dev-python/sphinxcontrib-plantuml/files/sphinxcontrib-plantuml-0.29-pytest-8.patch
deleted file mode 100644
index 2f10e1fae51d..000000000000
--- a/dev-python/sphinxcontrib-plantuml/files/sphinxcontrib-plantuml-0.29-pytest-8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 74e31ad4dd8f4fefd5b9e430e4d9caea3002fd97 Mon Sep 17 00:00:00 2001
-From: Yuya Nishihara <yuya@tcha.org>
-Date: Sun, 10 Mar 2024 19:30:21 +0900
-Subject: [PATCH] tests: rename setup/teardown functions for pytest 8.1.1
- compatibility
-
-I don't know if that's intended, but nose-style setup() is no longer called.
----
- tests/test_functional.py | 4 ++--
- tests/test_svgstyle.py   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test_functional.py b/tests/test_functional.py
-index 697b01d..8ef6a3d 100644
---- a/tests/test_functional.py
-+++ b/tests/test_functional.py
-@@ -12,7 +12,7 @@
- _fakecmd = os.path.join(os.path.dirname(__file__), 'fakecmd.py')
- 
- 
--def setup():
-+def setup_module():
-     global _tempdir, _srcdir, _outdir
-     _tempdir = tempfile.mkdtemp()
-     _srcdir = os.path.join(_tempdir, 'src')
-@@ -20,7 +20,7 @@ def setup():
-     os.mkdir(_srcdir)
- 
- 
--def teardown():
-+def teardown_module():
-     shutil.rmtree(_tempdir)
- 
- 
-diff --git a/tests/test_svgstyle.py b/tests/test_svgstyle.py
-index c62e1ed..a25901f 100644
---- a/tests/test_svgstyle.py
-+++ b/tests/test_svgstyle.py
-@@ -5,12 +5,12 @@
- from sphinxcontrib import plantuml
- 
- 
--def setup():
-+def setup_module():
-     global _tempdir
-     _tempdir = tempfile.mkdtemp()
- 
- 
--def teardown():
-+def teardown_module():
-     shutil.rmtree(_tempdir)
- 
- 
diff --git a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.29.ebuild b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.29.ebuild
deleted file mode 100644
index f293d79e9e0e..000000000000
--- a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.29.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for PlantUML"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/plantuml/
-	https://pypi.org/project/sphinxcontrib-plantuml/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/plantuml/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${P#sphinxcontrib-}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-BDEPEND="
-	test? (
-		app-text/texlive
-		dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-		dev-tex/latexmk
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latexextra
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/sphinx-contrib/plantuml/commit/74e31ad4dd8f4fefd5b9e430e4d9caea3002fd97
-	"${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
-	# Fix for sphinx.errors.ExtensionError: Could not import extension sphinxcontrib.applehelp
-	# See https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions, thanks to mgorny.
-	rm -rf sphinxcontrib || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.30.ebuild b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.30.ebuild
index e303060263ca..9e5036baf13e 100644
--- a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.30.ebuild
+++ b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.30.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P#sphinxcontrib-}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 BDEPEND="
 	test? (