From c5ee568457ac776b65b71fa444e0dd47535bc44a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Jan 2023 20:49:18 +0000 Subject: gentoo auto-resync : 27:01:2023 - 20:49:18 --- sci-mathematics/Manifest.gz | Bin 18387 -> 18376 bytes sci-mathematics/coq-serapi/Manifest | 2 +- .../coq-serapi/coq-serapi-0.16.2-r1.ebuild | 67 ++++++++++++++++ .../coq-serapi/coq-serapi-0.16.2.ebuild | 66 ---------------- sci-mathematics/mathlib-tools/Manifest | 9 +-- .../files/mathlib-tools-1.3.2-pull-131.patch | 84 +++++++++++++++++++++ .../mathlib-tools/mathlib-tools-1.3.0.ebuild | 53 ------------- .../mathlib-tools/mathlib-tools-1.3.1.ebuild | 53 ------------- .../mathlib-tools/mathlib-tools-1.3.2.ebuild | 53 ------------- .../mathlib-tools/mathlib-tools-1.3.2_p1.ebuild | 56 ++++++++++++++ 10 files changed, 211 insertions(+), 232 deletions(-) create mode 100644 sci-mathematics/coq-serapi/coq-serapi-0.16.2-r1.ebuild delete mode 100644 sci-mathematics/coq-serapi/coq-serapi-0.16.2.ebuild create mode 100644 sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch delete mode 100644 sci-mathematics/mathlib-tools/mathlib-tools-1.3.0.ebuild delete mode 100644 sci-mathematics/mathlib-tools/mathlib-tools-1.3.1.ebuild delete mode 100644 sci-mathematics/mathlib-tools/mathlib-tools-1.3.2.ebuild create mode 100644 sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index 3458ab847b2f..576d61b69cf7 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest index a4af74e9269a..9ac457a410fc 100644 --- a/sci-mathematics/coq-serapi/Manifest +++ b/sci-mathematics/coq-serapi/Manifest @@ -5,5 +5,5 @@ DIST coq-serapi-0.16.1.tar.gz 271068 BLAKE2B 5e832f4b2d2627938f2399b3eff111a1598 DIST coq-serapi-0.16.2.tar.gz 272807 BLAKE2B 20a04ae8b18fba7c6d8346515d4f610750e32e6a521dc65afd7a624ae07ddea75b4f8aed237ba95ed16667f3867b35dd914b35eab966187f6f41f547f3bac8d6 SHA512 f7aba7009f14302246eabe595af7cb72103b8904e45c647783326f46d51b1331b30dd515364c4b909f02c42c5bf7bd367dc0fe64eb9c88b062cd79113b53306b EBUILD coq-serapi-0.16.0-r1.ebuild 1472 BLAKE2B 5c0465c49866d234a30137572b01d55a43e9284f20487922e20341821095dcd144b377f7ec06f4d51395c23bd15f6d86bc022581fff14dabf0fdc20be136be95 SHA512 438a5770a640de6ae277f780ee5794509c031eacc637a5461d8cdf95d9403d47ecaaccc20aa6e09dc0a2b55f3163eb8445a3189235de0e09f04bfd7b27e10242 EBUILD coq-serapi-0.16.1.ebuild 1472 BLAKE2B 5c0465c49866d234a30137572b01d55a43e9284f20487922e20341821095dcd144b377f7ec06f4d51395c23bd15f6d86bc022581fff14dabf0fdc20be136be95 SHA512 438a5770a640de6ae277f780ee5794509c031eacc637a5461d8cdf95d9403d47ecaaccc20aa6e09dc0a2b55f3163eb8445a3189235de0e09f04bfd7b27e10242 -EBUILD coq-serapi-0.16.2.ebuild 1472 BLAKE2B 77dea962e7749bf235cab68409e7f6add49a9abb110682801aef156c7ea258e5488fe12ac4e8d36bc8a68c8fee897b8ab71bfb1295e90cd130554092edbdfd49 SHA512 65d7960e49048016de9133ea36e26263a5b02c1dfb36e931b39ff02b66a934cd657cd5c621547cb164e72b717558edc457393e50aed4bfd18adfd3a721ebd9bb +EBUILD coq-serapi-0.16.2-r1.ebuild 1442 BLAKE2B 04cc83c611cd63bbee704cf575a8a8ba3713902c7182ebeee5b638ff50c14b51f2ec95939a9920eae353ec93656dcfb8c45c5e8808c489e15fff0fc47d91cc17 SHA512 4d4549fcf593184102ff3162a228c123f74bd13163d2c2831bbec094e5850e23b6be0d01d28ff19c84368bb98dc5ef16fd07e3061a14122ba970700ba1ebbc75 MISC metadata.xml 935 BLAKE2B e1444df414ce499df466597f5e0949e8ebf2d6da23d77028546324109659f58c5f0284a315ea062410a2f2e4631aac8d3564664719e89d76ad6ded9bb8ba7a5f SHA512 172fedbb2aa42e2be9aff426d64fcd69d2dfa206bb0e6072c6ecdc14a1923a2f0676303d8d8aebfe9a3e96e0a1e89185d2d4952bdb9ba1fff44b3891f26d6bf7 diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.16.2-r1.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.16.2-r1.ebuild new file mode 100644 index 000000000000..44a2d0a9b186 --- /dev/null +++ b/sci-mathematics/coq-serapi/coq-serapi-0.16.2-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COQV=8.16.0 + +inherit elisp-common dune + +DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant" +HOMEPAGE="https://github.com/ejgallego/coq-serapi/" + +# The tarball in SRC_URI is comprised of + +SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQV}+${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${COQV}-${PV} + +LICENSE="GPL-3+" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=sci-mathematics/coq-${COQV}:= =dev-ml/ppx_sexp_conv-0.13.0:= + dev-ml/cmdliner:= + dev-ml/ppx_compare:= + dev-ml/ppx_deriving:= + dev-ml/ppx_deriving_yojson:= + dev-ml/ppx_hash:= + dev-ml/ppx_import:= + dev-ml/sexplib:= + dev-ml/yojson:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) + test? ( sci-mathematics/coq-mathcomp ) +" + +PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch ) +SITEFILE="50sertop-gentoo.el" + +src_compile() { + dune_src_compile + + use emacs && elisp-compile sertop.el +} + +src_install() { + dune_src_install + + rm -r "${D}"/usr/share/emacs || die + if use emacs ; then + elisp-install ${PN} sertop.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.16.2.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.16.2.ebuild deleted file mode 100644 index 3c68fbf69d0d..000000000000 --- a/sci-mathematics/coq-serapi/coq-serapi-0.16.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -COQV=8.16.0 - -inherit elisp-common dune - -DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant" -HOMEPAGE="https://github.com/ejgallego/coq-serapi/" -# The tarball in SRC_URI is comprised of + -SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQV}+${PV}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${COQV}-${PV} - -LICENSE="GPL-3+" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=sci-mathematics/coq-${COQV}:= =dev-ml/ppx_sexp_conv-0.13.0:= 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.0.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.0.ebuild deleted file mode 100644 index b97ef8a242c6..000000000000 --- a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.0.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.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.2_p1.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild new file mode 100644 index 000000000000..812a7aaeeb5b --- /dev/null +++ b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild @@ -0,0 +1,56 @@ +# 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 + _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 + +LICENSE="Apache-2.0" +SLOT="0" + +BDEPEND=" + >=dev-python/GitPython-2.1.11[${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/tomli-w[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] +" +RDEPEND=" + ${BDEPEND} + sci-mathematics/lean:0/3 +" + +PATCHES=( "${FILESDIR}"/${PN}-1.3.2-pull-131.patch ) + +distutils_enable_tests pytest + +src_prepare() { + # Remove problematic tests (mainly issues with network) + rm ./tests/test_functional.py || die + + distutils-r1_python_prepare_all +} -- cgit v1.2.3