From 9b284498be4979a2dcbcfb40a9fd1bafcedddecb Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 24 Jan 2023 11:04:26 +0100 Subject: [PATCH] dev-python/snakeoil: Sync with Gentoo It's from Gentoo commit 42f8229136e9f37f564a8c8f3e3b86b2e7091286. --- .../dev-python/snakeoil/Manifest | 5 +-- .../dev-python/snakeoil/metadata.xml | 17 +++++----- ...l-0.9.10.ebuild => snakeoil-0.10.5.ebuild} | 16 +++++----- .../dev-python/snakeoil/snakeoil-0.9.5.ebuild | 28 ----------------- .../dev-python/snakeoil/snakeoil-0.9.7.ebuild | 31 ------------------- .../dev-python/snakeoil/snakeoil-0.9.9.ebuild | 31 ------------------- .../dev-python/snakeoil/snakeoil-9999.ebuild | 18 ++++++----- 7 files changed, 29 insertions(+), 117 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-python/snakeoil/{snakeoil-0.9.10.ebuild => snakeoil-0.10.5.ebuild} (63%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest index 09d6616a70..f0bfef02d0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest @@ -1,4 +1 @@ -DIST snakeoil-0.9.10.tar.gz 264409 BLAKE2B ef4cff92b1110f3b0912a2899732a29de041ea0e1d5338bbee9b84cbd1e9b4231b66be8fbf98bb14e59360294de9652b816b1de904dc948a3ebcd3e429bd03ba SHA512 dfdf3c96a9e65d6353e9251bb4c9c761d9c6084185119f7e653efc27868e5dd41ece0c54307e306d14effd9c2fcfd3ec15407df3f15f2d4ecfe16ae00c6d7e00 -DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105 -DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6 -DIST snakeoil-0.9.9.tar.gz 264344 BLAKE2B 160f45dad3a53371063c0c86c186a8baf6370751cf455d84f6e9b9334e6e6f0aa76962803daff031f050d5d8b05b85ebcb05a2b8b9e957babac6e01f127a722f SHA512 bada12556fd2c63fabc8340444f470e08c68ffe56612ae14f08f155c11bd1d4b9657a885cfdee7454faf758309f5287792adf2cf5bd7ab411c7fd6b4982f229e +DIST snakeoil-0.10.5.tar.gz 183358 BLAKE2B 6154eb0b5ce55aefc67484dc33c8a6e36ee903bce4293045252a8c9a3b4ecfc27690c720bb46842c1bca8c14ef59fbae4d3c1f02ebd46a7c91c1c9fbd1aa1532 SHA512 fafc04aa65423ebb3db66daa9c239bdf0968722b8ac14c1206dd3f26e3960d832fd15001e320463f98ca142ec7e1d6bff73ebc0ab10c3c5d3cde241b8160fdc3 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml index 7778aca7bd..82a7321ef2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/metadata.xml @@ -1,12 +1,13 @@ - - mgorny@gentoo.org - Michał Górny - - - pkgcore/snakeoil - snakeoil - + + pkgcore@gentoo.org + Pkgcore + + + + pkgcore/snakeoil + snakeoil + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild similarity index 63% rename from sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.10.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild index 727ebffd5e..a92092e2e3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{9..11} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/snakeoil.git + https://github.com/pkgcore/snakeoil.git" inherit git-r3 else KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" @@ -22,10 +24,10 @@ LICENSE="BSD BSD-2 MIT" SLOT="0" RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}] +" BDEPEND=" - test? ( >=dev-python/pytest-6 )" - -[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + >=dev-python/flit_core-3.8[${PYTHON_USEDEP}] +" distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild deleted file mode 100644 index 4c6cfdc00b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil" - -LICENSE="BSD BSD-2 MIT" -SLOT="0" - -RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" - -[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild deleted file mode 100644 index 036e753319..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil" - -LICENSE="BSD BSD-2 MIT" -SLOT="0" - -RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( >=dev-python/pytest-6 )" - -[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.9.ebuild deleted file mode 100644 index 66ebcf0753..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.9.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil" - -LICENSE="BSD BSD-2 MIT" -SLOT="0" - -RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( >=dev-python/pytest-6 )" - -[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild index 66ebcf0753..88ca572e1a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{9..11} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/snakeoil.git + https://github.com/pkgcore/snakeoil.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" fi @@ -22,10 +24,10 @@ LICENSE="BSD BSD-2 MIT" SLOT="0" RDEPEND=" - dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}] +" BDEPEND=" - test? ( >=dev-python/pytest-6 )" - -[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + >=dev-python/flit_core-3.8[${PYTHON_USEDEP}] +" distutils_enable_tests pytest