From e99c7ed2c2edf5e0bc249d74108f4fe381b055ac Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 10 Sep 2021 20:59:36 +0200 Subject: [PATCH] dev-python/snakeoil: Sync with gentoo It's from gentoo commit 77f025dfa858377a85705459ea5e61f678d87edd. --- .../dev-python/snakeoil/Manifest | 4 +-- .../dev-python/snakeoil/metadata.xml | 6 ++-- .../dev-python/snakeoil/snakeoil-0.7.4.ebuild | 35 ------------------- .../dev-python/snakeoil/snakeoil-0.7.5.ebuild | 35 ------------------- .../dev-python/snakeoil/snakeoil-0.9.5.ebuild | 28 +++++++++++++++ .../dev-python/snakeoil/snakeoil-0.9.7.ebuild | 31 ++++++++++++++++ .../dev-python/snakeoil/snakeoil-9999.ebuild | 30 ++++++++-------- 7 files changed, 78 insertions(+), 91 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.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 c21b6c6714..9419952802 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,2 +1,2 @@ -DIST snakeoil-0.7.4.tar.gz 301878 BLAKE2B ec40ba5921e6edd33cb9dd80a284dee0cc8940dbb71f7bb6390d7008c0ca3a657b70be225955d7d6b99aa9e8c9d16dc926560bab17ac917ea8f71f97a1cf4644 SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce -DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5 +DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105 +DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6 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 9defaede9a..7778aca7bd 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,9 +1,9 @@ - + - radhermit@gentoo.org - Tim Harder + mgorny@gentoo.org + Michał Górny pkgcore/snakeoil diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild deleted file mode 100644 index c037456a6e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -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 ~s390 ~sh ~sparc ~x86" - 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" -SLOT="0" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] )" -[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')" - -python_configure_all() { - # disable snakeoil 2to3 caching - unset PY2TO3_CACHEDIR -} - -python_test() { - esetup.py test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild deleted file mode 100644 index 74f9fa6d5b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.7.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -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 ~s390 ~sh sparc x86" - SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil" - -LICENSE="BSD" -SLOT="0" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] )" -[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')" - -python_configure_all() { - # disable snakeoil 2to3 caching - unset PY2TO3_CACHEDIR -} - -python_test() { - esetup.py test -} 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 new file mode 100644 index 0000000000..4c6cfdc00b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.5.ebuild @@ -0,0 +1,28 @@ +# 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 new file mode 100644 index 0000000000..036e753319 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.9.7.ebuild @@ -0,0 +1,31 @@ +# 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 431ad815ed..53cc9eba8f 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,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -10,24 +11,21 @@ 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 ~s390 ~sh ~sparc ~x86" - SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" +LICENSE="BSD BSD-2 MIT" SLOT="0" -IUSE="test" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - )" -[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( >=dev-python/pytest-6 )" -python_test() { - esetup.py test -} +[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest