From 0faabde57cc8b04289616996e17c0f73fbc6a571 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 24 Jan 2023 11:05:04 +0100 Subject: [PATCH] dev-python/tomli: Sync with Gentoo It's from Gentoo commit 0b19d5ccdbc482684dfcdcf9f5550c977ecce93b. --- .../portage-stable/dev-python/tomli/Manifest | 2 -- .../dev-python/tomli/tomli-1.2.3.ebuild | 36 ------------------- ...mli-2.0.1.ebuild => tomli-2.0.1-r1.ebuild} | 22 +++++------- 3 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.3.ebuild rename sdk_container/src/third_party/portage-stable/dev-python/tomli/{tomli-2.0.1.ebuild => tomli-2.0.1-r1.ebuild} (58%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest index 99d952ed57..b87d6410b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/Manifest @@ -1,4 +1,2 @@ -DIST tomli-1.2.3-py3-none-any.whl.zip 12122 BLAKE2B ad0037b3761a13043bffb5875a25c7e18b71ac8cdb4491ca9c7cc60f593acd588ac38d7d9f7c48da217adfcfe5100bed3af215da2bffc06064d4817bf9923ec3 SHA512 7dd3ca4851728ef78cb288f51a446ddf25be5a6454a8dbfb4987f7078fe744ac76021ed7046bdbb630b4989479bc932ce649c5e3af33f43724f9714fb755209f -DIST tomli-1.2.3.gh.tar.gz 123142 BLAKE2B e8af1618aa962d7ff56d319c3a789c7655d9cb95e79f27b90cd9f9c7e978d2e29a49abef3884c4f53788305e54f8e919992d65fcec12679a9346690d86b7dd6a SHA512 270dbfe1df2e7f2692c35be5cc45e0b78e9e045e150fe959f4d6db8e3022126e7c17338636e57ba553fd928cbfd227938cfcd13128e1f05ee8cff29327594c61 DIST tomli-2.0.1-py3-none-any.whl.zip 12757 BLAKE2B 0a33773bc0409831aec6ee803ef0ef9d6b6b441213d549184068e218b73d6178d617bc2b58d11db98f0e6284baaf81663723fbc6eb89f7466608f0d89aeb1982 SHA512 b6164b03d3db360093f92e644e87a37a0ce20d63d7e9e271fcafd727f4fdb73ad6b301aaf32b3d2839f6eedbc8ea499dafba7335b8fdfc4667e30ed50c9805b4 DIST tomli-2.0.1.gh.tar.gz 133685 BLAKE2B 0d3a1f4ee4e74eeab6a7e7c3d5e866ce1baf9017136cdc8ce1f6275f8d6d151239e5a00b97b6409872fac0e8558a49120adf16f0ae21f9d92ae630dfd39cd6ff SHA512 a467f8d48cdbd7213bd9b6f85fd48ba142ab7c9656c40bb30785e1c4b37a9e29eaed420f183458ad20112baee8413ebbec87755332795c8f02235d1018c3aa5c diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.3.ebuild deleted file mode 100644 index 4c213f9640..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-1.2.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="A lil' TOML parser" -HOMEPAGE=" - https://pypi.org/project/tomli/ - https://github.com/hukkin/tomli/" -SRC_URI=" - https://github.com/hukkin/tomli/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl - -> ${P}-py3-none-any.whl.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos" - -BDEPEND=" - app-arch/unzip - test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest - -# do not use any build system to avoid circular deps -python_compile() { :; } - -python_install() { - python_domodule tomli "${WORKDIR}"/*.dist-info -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild index ca6baab56c..0dca726d29 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep EAPI=7 -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{8..11} pypy3 ) +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{9..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A lil' TOML parser" HOMEPAGE=" @@ -17,10 +17,8 @@ HOMEPAGE=" SRC_URI=" https://github.com/hukkin/tomli/archive/${PV}.tar.gz -> ${P}.gh.tar.gz - https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl - -> ${P}-py3-none-any.whl.zip + $(pypi_wheel_url --unpack) " -S=${WORKDIR} LICENSE="MIT" SLOT="0" @@ -32,13 +30,11 @@ BDEPEND=" distutils_enable_tests unittest -# do not use any build system to avoid circular deps -python_compile() { :; } - -python_test() { - eunittest -s "${P}" +python_compile() { + python_domodule src/tomli "${WORKDIR}"/*.dist-info } python_install() { - python_domodule tomli *.dist-info + distutils-r1_python_install + python_optimize }