gentoo auto-resync : 27:01:2023 - 20:49:18

5 files changed, 95 insertions, 117 deletions

diff --git a/sci-mathematics/mathlib-tools/Manifest b/sci-mathematics/mathlib-tools/Manifest
index 355fad1b8a03..bf3296298e3d 100644
--- a/sci-mathematics/mathlib-tools/Manifest
+++ b/sci-mathematics/mathlib-tools/Manifest
@@ -1,7 +1,4 @@
-DIST mathlib-tools-1.3.0.tar.gz 34918 BLAKE2B 4d54922cfe5de3d6671161081c49fe82568ad90795ece8ad43e9f62c75415204e62ff1822be213ab259371e82ea869ff63195056cc415a1f376fa0a4a438fb4f SHA512 250390e55170e5a7520f34dee27c9846351a64c4157e9f4a0ec1d0d9bf6b075b09187476375a90e7df2fdab6ce7b7b51ff03f1bf28007915242811f377ce3150
-DIST mathlib-tools-1.3.1.tar.gz 34918 BLAKE2B 4d54922cfe5de3d6671161081c49fe82568ad90795ece8ad43e9f62c75415204e62ff1822be213ab259371e82ea869ff63195056cc415a1f376fa0a4a438fb4f SHA512 250390e55170e5a7520f34dee27c9846351a64c4157e9f4a0ec1d0d9bf6b075b09187476375a90e7df2fdab6ce7b7b51ff03f1bf28007915242811f377ce3150
-DIST mathlib-tools-1.3.2.tar.gz 34918 BLAKE2B 4d54922cfe5de3d6671161081c49fe82568ad90795ece8ad43e9f62c75415204e62ff1822be213ab259371e82ea869ff63195056cc415a1f376fa0a4a438fb4f SHA512 250390e55170e5a7520f34dee27c9846351a64c4157e9f4a0ec1d0d9bf6b075b09187476375a90e7df2fdab6ce7b7b51ff03f1bf28007915242811f377ce3150
-EBUILD mathlib-tools-1.3.0.ebuild 1334 BLAKE2B 016764586ae3b035fed3ddfb66b97a3d473b5328adfe2c3e46de75f9f85cf2d6d7fc5719b9d5b9547741cf60fea1c6c34fed3f73deeacf81d752786555c877c3 SHA512 31cc6788e12edc66b915a8cbbc6b3e560dc2d878affdb97f4911eba81563be5358342b34cc7dcc70586cc461835ee0a07218e362b67f6023abdf72cddbb5e0e9
-EBUILD mathlib-tools-1.3.1.ebuild 1334 BLAKE2B 016764586ae3b035fed3ddfb66b97a3d473b5328adfe2c3e46de75f9f85cf2d6d7fc5719b9d5b9547741cf60fea1c6c34fed3f73deeacf81d752786555c877c3 SHA512 31cc6788e12edc66b915a8cbbc6b3e560dc2d878affdb97f4911eba81563be5358342b34cc7dcc70586cc461835ee0a07218e362b67f6023abdf72cddbb5e0e9
-EBUILD mathlib-tools-1.3.2.ebuild 1334 BLAKE2B 016764586ae3b035fed3ddfb66b97a3d473b5328adfe2c3e46de75f9f85cf2d6d7fc5719b9d5b9547741cf60fea1c6c34fed3f73deeacf81d752786555c877c3 SHA512 31cc6788e12edc66b915a8cbbc6b3e560dc2d878affdb97f4911eba81563be5358342b34cc7dcc70586cc461835ee0a07218e362b67f6023abdf72cddbb5e0e9
+AUX mathlib-tools-1.3.2-pull-131.patch 3637 BLAKE2B bf7128554dc0727c80a754081aca5fe75e5df33e1429b9b94243884209049cab57f32139c8149732a4e6bf6eb4c58b60d7adcbd100fa4d65de7c265a9d54eaee SHA512 d222078b011f3169f0fbdbc6a05a7d9593209ded23a407b9998b5f572b308d9064fec1767a26013997ca882d4f51bae9938661efd548270efdbbe8099d770151
+DIST mathlib-tools-1.3.2_p1.gh.tar.gz 36686 BLAKE2B 0120e64821c183e368a4ca7d7122146637b933c9f56279c15716c825ac6e0e20d19f8ece731ee5c4114b7c221e84b53d3b89fcc0268529cbd1f2ad3328ac7847 SHA512 7b3c5a8aea19a4c7df366c71baa19e3d8ab6a0a6b387973ed37aecf3003361f298b85a4deecc8a4fcb6a2003f666c503fd66cde986e412003d439d48345afbc7
+EBUILD mathlib-tools-1.3.2_p1.ebuild 1398 BLAKE2B 85a555a73b55698c440a57c13627b9427111bf382610d6e6cb604c4029c9071a610fd115b6cf90bf5877fd1f0262d4e7db7b6796887c626df02010096a01137b SHA512 5349264a2d92840550c7f3f39391d34354063eb91f15b7efe3c416c82e88d5dc34c1b73fe16ccf7c2b1cec57d207f548d50de252678221e17de7a1061fdd852b
 MISC metadata.xml 845 BLAKE2B 8d01442128f49f1c8c0c29cf4469d775936149cdde77d7e96a6825bc631119a4e83932bc67f9e60781128f0c179ef7e622edcc9836d7fb3f4240b356e92caf8b SHA512 8add0a2a70e219d5581ef7fdcd0125ab1375c65d631093df02559e462974b07cef0bf1fe75919707be026b91e77131b24d3b197a5c332961c6a573ddf899c939
diff --git a/sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch b/sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch
new file mode 100644
index 000000000000..2debd3d6b396
--- /dev/null
+++ b/sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch
@@ -0,0 +1,84 @@
+--- a/mathlibtools/lib.py
++++ b/mathlibtools/lib.py
+@@ -21,7 +21,8 @@
+ 
+ import requests
+ from tqdm import tqdm # type: ignore
+-import toml
++import tomli
++import tomli_w
+ import yaml
+ from git import (Repo, Commit, InvalidGitRepositoryError,  # type: ignore
+                  GitCommandError, BadName, RemoteReference) # type: ignore
+@@ -84,7 +85,7 @@ def mathlib_lean_version() -> VersionTuple:
+     """Return the latest Lean release supported by mathlib"""
+     resp = requests.get("https://raw.githubusercontent.com/leanprover-community/mathlib/master/leanpkg.toml")
+     assert resp.status_code == 200
+-    conf = toml.loads(resp.text)
++    conf = tomli.loads(resp.text)
+     return parse_version(conf['package']['lean_version'])
+ 
+ def set_download_url(url: str = AZURE_URL) -> None:
+@@ -441,7 +442,8 @@ def from_path(cls, path: Path, cache_url: str = '',
+             except ValueError:
+                 rev = ''
+         directory = find_root(path)
+-        config = toml.load(directory/'leanpkg.toml')
++        with (directory/'leanpkg.toml').open('rb') as pkgtoml:
++            config = tomli.load(pkgtoml)
+ 
+         return cls(repo, is_dirty, rev, directory,
+                    config['package'], config['dependencies'],
+@@ -456,7 +458,8 @@ def user_wide(cls, cache_url: str = '',
+         version of Lean supported by mathlib."""
+         directory = Path.home()/'.lean'
+         try:
+-            config = toml.load(directory/'leanpkg.toml')
++            with (directory/'leanpkg.toml').open('rb') as pkgtoml:
++                config = tomli.load(pkgtoml)
+         except FileNotFoundError:
+             directory.mkdir(exist_ok=True)
+             version = mathlib_lean_version()
+@@ -469,8 +472,8 @@ def user_wide(cls, cache_url: str = '',
+             pkg = { 'name': '_user_local_packages',
+                     'version': '1',
+                     'lean_version': version_str }
+-            with (directory/'leanpkg.toml').open('w') as pkgtoml:
+-                toml.dump({'package': pkg}, pkgtoml)
++            with (directory/'leanpkg.toml').open('wb') as pkgtoml:
++                tomli_w.dump({'package': pkg}, pkgtoml)
+             config = { 'package': pkg, 'dependencies': dict() }
+ 
+         return cls(None, False, '', directory,
+@@ -534,7 +537,8 @@ def mathlib_repo(self) -> Repo:
+ 
+     def read_config(self) -> None:
+         try:
+-            config = toml.load(self.directory/'leanpkg.toml')
++            with (self.directory/'leanpkg.toml').open('rb') as pkgtoml:
++                config = tomli.load(pkgtoml)
+         except FileNotFoundError:
+             raise InvalidLeanProject('Missing leanpkg.toml')
+ 
+@@ -551,7 +555,7 @@ def write_config(self) -> None:
+         # for dependencies.
+         with (self.directory/'leanpkg.toml').open('w') as cfg:
+             cfg.write('[package]\n')
+-            cfg.write(toml.dumps(self.pkg_config))
++            cfg.write(tomli_w.dumps(self.pkg_config))
+             cfg.write('\n[dependencies]\n')
+             for dep, val in self.deps.items():
+                 nval = str(val).replace("'git':", 'git =').replace(
+
+--- a/setup.py
++++ b/setup.py
+@@ -28,7 +28,7 @@
+         "License :: OSI Approved :: Apache Software License",
+         "Operating System :: OS Independent" ],
+     python_requires='>=3.6',
+-    install_requires=['toml>=0.10.0', 'PyGithub', 'certifi', 'gitpython>=2.1.11', 'requests',
++    install_requires=['tomli', 'tomli-w', 'PyGithub', 'certifi', 'gitpython>=2.1.11', 'requests',
+                       'Click', 'tqdm', 'networkx', 'pydot',
+                       'PyYAML>=3.13', 'atomicwrites', "dataclasses; python_version=='3.6'"]
+ )
+
diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.1.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.1.ebuild
deleted file mode 100644
index b97ef8a242c6..000000000000
--- a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="Development tools for Lean's mathlib"
-HOMEPAGE="https://github.com/leanprover-community/mathlib-tools"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leanprover-community/${PN}.git"
-else
-	H=1ce2e7143b2456867f4a671a078a4e9af3c73c11
-	SRC_URI="https://github.com/leanprover-community/${PN}/archive/${H}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	>=dev-python/GitPython-2.1.11[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.0[${PYTHON_USEDEP}]
-	dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pydot[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	sci-mathematics/lean:0/3
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Remove problematic tests (mainly issues with network)
-	rm ./tests/test_functional.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2.ebuild
deleted file mode 100644
index b97ef8a242c6..000000000000
--- a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1
-
-DESCRIPTION="Development tools for Lean's mathlib"
-HOMEPAGE="https://github.com/leanprover-community/mathlib-tools"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leanprover-community/${PN}.git"
-else
-	H=1ce2e7143b2456867f4a671a078a4e9af3c73c11
-	SRC_URI="https://github.com/leanprover-community/${PN}/archive/${H}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND="
-	>=dev-python/GitPython-2.1.11[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.0[${PYTHON_USEDEP}]
-	dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pydot[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	sci-mathematics/lean:0/3
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Remove problematic tests (mainly issues with network)
-	rm ./tests/test_functional.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.0.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild
index b97ef8a242c6..812a7aaeeb5b 100644
--- a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.0.ebuild
+++ b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild
@@ -15,10 +15,10 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/leanprover-community/${PN}.git"
 else
-	H=1ce2e7143b2456867f4a671a078a4e9af3c73c11
-	SRC_URI="https://github.com/leanprover-community/${PN}/archive/${H}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
+	_PV=${PV/_p1/}
+	SRC_URI="https://github.com/leanprover-community/${PN}/archive/v${_PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}"/${PN}-${_PV}
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,7 +27,6 @@ SLOT="0"
 
 BDEPEND="
 	>=dev-python/GitPython-2.1.11[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.0[${PYTHON_USEDEP}]
 	dev-python/PyGithub[${PYTHON_USEDEP}]
 	dev-python/atomicwrites[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
@@ -36,6 +35,8 @@ BDEPEND="
 	dev-python/pydot[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 "
 RDEPEND="
@@ -43,6 +44,8 @@ RDEPEND="
 	sci-mathematics/lean:0/3
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-1.3.2-pull-131.patch )
+
 distutils_enable_tests pytest
 
 src_prepare() {