diff options
Diffstat (limited to 'dev-python/python-varlink')
5 files changed, 69 insertions, 35 deletions
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest index f3ab2e7ba207..d7a14320f6b4 100644 --- a/dev-python/python-varlink/Manifest +++ b/dev-python/python-varlink/Manifest @@ -1,3 +1,4 @@ -DIST python-varlink-30.3.0.tar.gz 40124 BLAKE2B a93fe2fad156dfd8f74841846dbe9da127d01e837ad0ae750658b0391da006c913eef663e4777ad2fc6c9c2d19746e52d7e66c49cdd43f0417db9d558d4b5dee SHA512 1aac105d62452144525d8b4c59dbd7a70a9cf82589cce0b98ac56e457d985d2c370f8ce99d209294b4a4cfe1683ae2bc1a280ea5a8878ecd4bcf2951ff0b802d -EBUILD python-varlink-30.3.0.ebuild 753 BLAKE2B 7e55c45601377459b070ac67f87f8b14b0ad8a6cceeffbc438b8b0f70da7a66312492e3cabbb621b1b08872235ffcc1fc7391a01b2a71adcf42ca99cd88e9da4 SHA512 5860b9e118788d2ff07e7fe8d76fd9d590a120af28dcd2037f76b5cad783dfabbe3389f681e2aa55ddf0051be06edab1d2a4bccf21b6f0b3609162e67cad3194 -MISC metadata.xml 368 BLAKE2B 4af59ab1c33a904380f1c2cebd76618b9286ac076024008bf60961eda1a4895fab7c577fe8ae342238ad65d26cb21ba8e76ad9752e76313ca9e0460fd7b04a95 SHA512 3aa1f68a1ec8a06b0506e3b9500095c18b892225906ee57318182a1590e494c404d5ccde60af935e742683374fdf7a1a1db1c5746debd5be5af94bc940038388 +AUX python-varlink-30.3.1-fix.py3.10.patch 875 BLAKE2B e5b20de19382359afa9d51931b30f06f13bcf4c917d90b7ebc941d4c126df0f9a20282e78b5377163633dddc44f248ccd08b3c224a27dce00cc90ef92461acac SHA512 c8dd7f4d4e79e7a5cbdf377d29b997b92dbd8c5ed455bf790c9c1dd6cd31389dada7890aed99b5083ca0e7c30cdfbdc6f63eba917c04653ef9421ee8b6359b9c +DIST python-varlink-30.3.1.gh.tar.gz 39921 BLAKE2B d717eb662cd14fffd7620fb8f3eee5ae8431b77a437a783ba090802a26d0225439eb9305050863c85a6c33dbdd28709262858bf407a08333b177057304695c93 SHA512 13a0176694ee31121998a2dd88bf57d840ec20b0ccac63b574c4f12ef5c9bfbfbd67bdc7a8d362cd1c256e393d8c3691d1efc58aabaf8f5ec26067a55157a6cd +EBUILD python-varlink-30.3.1.ebuild 746 BLAKE2B d3c8f41ae98a3974af77ac91f81df086e993f3461d286437010ddcdffcd2e98cf7e43590d74955e91bb4d07dc8541a4fc420eb66ae99c8dae3d14aa746404092 SHA512 2de61e56810c33e6d350f9d46665a1cb6abeb4dcdb6f270e845bbb37fed46ede9cd3ee1d8125a3cbb7b825a4c6c893ff6bfd9f0cd9ddca001a18b552626a0dbe +MISC metadata.xml 392 BLAKE2B 67b11b26e4a8f97cd970b3c2b2bdf9928c29292b5ce68b7c9f23db39c0631c6a2a6f01cf6a8c9d18c572aee2ae2282ec759d44a158d38c1cb9add0826decd334 SHA512 eff3d02d55e38e228e5f20a2f4d2458b81ed4051209ad70ae974618eb0ff4579bb4c8a6b891fd1ef6872840689c90850f6fe665196cfbc51baba372344c2ab4f diff --git a/dev-python/python-varlink/files/python-varlink-30.3.1-fix.py3.10.patch b/dev-python/python-varlink/files/python-varlink-30.3.1-fix.py3.10.patch new file mode 100644 index 000000000000..e85826f6bc0e --- /dev/null +++ b/dev-python/python-varlink/files/python-varlink-30.3.1-fix.py3.10.patch @@ -0,0 +1,30 @@ +From 0a9014ad564131ee98dc8c4c1f9cc0c5e29d5dac Mon Sep 17 00:00:00 2001 +From: Arthur Zamarin <arthurzam@gentoo.org> +Date: Fri, 20 Aug 2021 10:37:42 +0300 +Subject: [PATCH] Python3.10: fix import collections + +Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org> +--- + varlink/scanner.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/varlink/scanner.py b/varlink/scanner.py +index d5a0e7b..58ced74 100644 +--- a/varlink/scanner.py ++++ b/varlink/scanner.py +@@ -21,7 +21,11 @@ try: + except: # Python 2 + from argparse import Namespace as SimpleNamespace + +-from collections import (Set, OrderedDict, Mapping) ++try: ++ from collections.abc import (Set, Mapping) ++ from collections import OrderedDict ++except ImportError: ++ from collections import (Set, OrderedDict, Mapping) + + from .error import (MethodNotFound, InvalidParameter) + +-- +2.33.0 + diff --git a/dev-python/python-varlink/metadata.xml b/dev-python/python-varlink/metadata.xml index 19f62fbd6c65..dfc0f3f42d01 100644 --- a/dev-python/python-varlink/metadata.xml +++ b/dev-python/python-varlink/metadata.xml @@ -5,6 +5,7 @@ <email>zmedico@gentoo.org</email> <name>Zac Medico</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">varlink</remote-id> <remote-id type="github">varlink/python</remote-id> diff --git a/dev-python/python-varlink/python-varlink-30.3.0.ebuild b/dev-python/python-varlink/python-varlink-30.3.0.ebuild deleted file mode 100644 index 1c92a3d95ae9..000000000000 --- a/dev-python/python-varlink/python-varlink-30.3.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="Python implementation of the Varlink protocol" -HOMEPAGE="https://github.com/varlink/python" -SRC_URI="https://github.com/varlink/python/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" - -KEYWORDS="~amd64" -RESTRICT="test" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -S="${WORKDIR}/python-${PV}" - -python_prepare_all() { - distutils-r1_python_prepare_all - - sed -e 's|^[[:space:]]*setuptools_scm$||' \ - -i setup.cfg || die -} - -python_test() { - esetup.py test || die "tests failed with ${EPYTHON}" -} diff --git a/dev-python/python-varlink/python-varlink-30.3.1.ebuild b/dev-python/python-varlink/python-varlink-30.3.1.ebuild new file mode 100644 index 000000000000..9a04cf6dc26a --- /dev/null +++ b/dev-python/python-varlink/python-varlink-30.3.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Python implementation of the Varlink protocol" +HOMEPAGE="https://github.com/varlink/python" +SRC_URI=" + https://github.com/varlink/python/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" +S="${WORKDIR}/python-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-python/future[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}/${P}-fix.py3.10.patch" +) + +distutils_enable_tests unittest + +python_prepare_all() { + distutils-r1_python_prepare_all + + sed -e '/setuptools_scm/d' -i setup.cfg || die + sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die +} |