From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-python/pysnmp/Manifest | 5 ++- .../pysnmp/files/pysnmp-4.4.12-python310.patch | 36 ++++++++++++++++ .../files/pysnmp-4.4.12-setuptools-version.patch | 20 +++++++++ dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild | 44 ------------------- dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild | 49 ++++++++++++++++++++++ dev-python/pysnmp/pysnmp-999999.ebuild | 43 ------------------- 6 files changed, 108 insertions(+), 89 deletions(-) create mode 100644 dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch create mode 100644 dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch delete mode 100644 dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild create mode 100644 dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild delete mode 100644 dev-python/pysnmp/pysnmp-999999.ebuild (limited to 'dev-python/pysnmp') diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest index bfff9868d7d3..9b8356b3b133 100644 --- a/dev-python/pysnmp/Manifest +++ b/dev-python/pysnmp/Manifest @@ -1,4 +1,5 @@ +AUX pysnmp-4.4.12-python310.patch 1368 BLAKE2B e06fc35d21ad783a023186a76862c6481811060ac7d62be1d869db00ef765ea6de43db740bcac3a0739971b0fcf3f572aa10b67c11ccb2230a3887fedebf7de7 SHA512 ce55137dc7ede872ff177d5f5e429f4e9aaa15964ecdef02fd2ebcd6164debb84b9e5720fd0def6478d8fa08676a56ec3ab0a093ae5b8f9f4160e185d5bd2606 +AUX pysnmp-4.4.12-setuptools-version.patch 807 BLAKE2B 84e1db3f4da12341ed243ce65eb3a5fdad1c12a9b1398fb630e8164326acf2b739cd0c103fff9e7dd49b73ce29b8d96872e617937e5eee39a0372bf97f4842ca SHA512 432c8e8f7e001e98ff0c7fb40dae948467bbdb646cd0a5a9cace4e3227c471f792df5c7d35ceea7eeda9c1bcb96d7a35ef8bed8fbb562bdd7e36bb98d8f371e5 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94 -EBUILD pysnmp-4.4.12-r1.ebuild 1092 BLAKE2B 0323a008ab6e0f746252f0ada14b12e58eb78c8130e83f624d70b2ffee75b2def2e0d5da6efa932dbc2630e82f3afe3acb185318cf82820c5e29fa8e356f5736 SHA512 609074134d9e590f29fc2eea8f83be382650838b016978222e88e2f7d83efc65ec8a62252121b2ea511836cf423841badbbd37168f69fee538f1ec54df18feac -EBUILD pysnmp-999999.ebuild 1054 BLAKE2B 2f01447b658a34aba23ffb46d608dfd1c557ea4e8b67c415b837c20794b2ff8445f0ac140f8c13753b013e038c3bc46b4296ba7663278c70fddc9fd0fba9c1f9 SHA512 f57285f2305bf0e769d477359865073b5a91a257bd3e1127e9a9ed1e294a910ada5e9f467e198de94543c3c1c984628a57f5b874b8be6a705c4feed820404998 +EBUILD pysnmp-4.4.12-r2.ebuild 1194 BLAKE2B fa1ee00cdb5ec25e78fd6009dead79f6b4f3e926ef4789ba50d611ab51ca9a8dc5dc8f9cd7ed536b738a87ee209e1d49d6c68e898103945e58122c03fb1fea33 SHA512 657d5c3507bd88b539f15116f330eeb35705651e2af087305aae5d1aea103dbadd7bcda9f511089fc8a662acf29e7964dec605689c024865374fb61532804175 MISC metadata.xml 1648 BLAKE2B 4713ec2e29a224ca30c27733717ae05d2dbeca152988f8d566d00df2822af4f9e9afdb0a2805afed7cccd94770a453719f1d66bfe0851f5ca482e809accd64d9 SHA512 b5dc8cf39d381896e8c6c247068fd3fbd617c7ab08438797fbf1cca029b8884ae98eba44a9ccb7eb62e9fd407d825fdcefd6431161fece51d804979f8c7a3936 diff --git a/dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch b/dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch new file mode 100644 index 000000000000..1fd272d8b5b6 --- /dev/null +++ b/dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch @@ -0,0 +1,36 @@ +https://github.com/etingof/pysnmp/pull/415 + +From 1d83beddd61b71e71dd725a12813a7052c14f730 Mon Sep 17 00:00:00 2001 +From: Flaviu Tamas +Date: Sun, 26 Dec 2021 18:07:09 -0500 +Subject: [PATCH 1/2] Fixes #413 + +Thanks to @mheppner for finding the issue and reporting the bug. +--- a/pysnmp/carrier/asyncio/dgram/base.py ++++ b/pysnmp/carrier/asyncio/dgram/base.py +@@ -44,7 +44,7 @@ + from pysnmp.carrier import error + from pysnmp.carrier.asyncio.base import AbstractAsyncioTransport + +-IS_PYTHON_344_PLUS = platform.python_version_tuple() >= ('3', '4', '4') ++IS_PYTHON_344_PLUS = [int(v) for v in platform.python_version_tuple()] >= [3, 4, 4] + + + class DgramAsyncioProtocol(asyncio.DatagramProtocol, AbstractAsyncioTransport): + +From fc5ad9c1b1b9195f49d327f471705f9519ce5c09 Mon Sep 17 00:00:00 2001 +From: Flaviu Tamas +Date: Fri, 31 Dec 2021 11:41:09 -0500 +Subject: [PATCH 2/2] Fix python 3.10 compatability, part 2 + +--- a/pysnmp/carrier/asyncio/dispatch.py ++++ b/pysnmp/carrier/asyncio/dispatch.py +@@ -43,7 +43,7 @@ + from pysnmp.carrier.base import AbstractTransportDispatcher + from pysnmp.error import PySnmpError + +-IS_PYTHON_344_PLUS = platform.python_version_tuple() >= ('3', '4', '4') ++IS_PYTHON_344_PLUS = [int(v) for v in platform.python_version_tuple()] >= [3, 4, 4] + + + class AsyncioDispatcher(AbstractTransportDispatcher): diff --git a/dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch b/dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch new file mode 100644 index 000000000000..e2793fd6eeaa --- /dev/null +++ b/dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch @@ -0,0 +1,20 @@ +https://github.com/etingof/pysnmp/commit/2ee8b8707d36e772d6308f434b445a766e6586e7 +https://bugs.gentoo.org/836608 + +From 2ee8b8707d36e772d6308f434b445a766e6586e7 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Thu, 7 Nov 2019 18:55:45 +0100 +Subject: [PATCH] Improve the setuptools version check (#322) + +Handles malformed `setuptools.__version__` such as "41.4.0.post20191022" +--- a/setup.py ++++ b/setup.py +@@ -85,7 +85,7 @@ def howto_install_setuptools(): + + setup, Command = setuptools.setup, setuptools.Command + +- observed_version = [int(x) for x in setuptools.__version__.split('.')] ++ observed_version = [int(x) for x in setuptools.__version__.split('.')[:3]] + required_version = [36, 2, 0] + + # NOTE(etingof): require fresh setuptools to build proper wheels diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild deleted file mode 100644 index b22b2db34bee..000000000000 --- a/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 optfeature - -DESCRIPTION="Python SNMP library" -HOMEPAGE="https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86" -IUSE="doc examples" - -RDEPEND=" - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}]" -PDEPEND="dev-python/pysmi[${PYTHON_USEDEP}]" - -distutils_enable_sphinx docs/source - -python_prepare_all() { - touch docs/source/conf.py || die - distutils-r1_python_prepare_all -} - -python_install_all() { - if use examples; then - docinto examples - dodoc -r examples/. docs/mibs - docompress -x /usr/share/doc/${PF}/examples - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Example programs using pysnmp" dev-python/pysnmp-apps - optfeature "IETF and other mibs" dev-python/pysnmp-mibs - optfeature "Dump MIBs in python format" dev-python/pysmi -} diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild new file mode 100644 index 000000000000..2e96456d58af --- /dev/null +++ b/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 optfeature + +DESCRIPTION="Python SNMP library" +HOMEPAGE="https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86" +IUSE="doc examples" + +RDEPEND=" + >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}]" +PDEPEND="dev-python/pysmi[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/${P}-setuptools-version.patch + "${FILESDIR}"/${PN}-4.4.12-python310.patch +) + +distutils_enable_sphinx docs/source + +python_prepare_all() { + touch docs/source/conf.py || die + distutils-r1_python_prepare_all +} + +python_install_all() { + if use examples; then + docinto examples + dodoc -r examples/. docs/mibs + docompress -x /usr/share/doc/${PF}/examples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Example programs using pysnmp" dev-python/pysnmp-apps + optfeature "IETF and other mibs" dev-python/pysnmp-mibs + optfeature "Dump MIBs in python format" dev-python/pysmi +} diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild deleted file mode 100644 index 3e79289ba474..000000000000 --- a/dev-python/pysnmp/pysnmp-999999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) -inherit distutils-r1 git-r3 optfeature - -DESCRIPTION="Python SNMP library" -HOMEPAGE="https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp" -EGIT_REPO_URI="https://github.com/etingof/pysnmp" - -LICENSE="BSD" -SLOT="0" -IUSE="doc examples" - -RDEPEND=" - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}]" -PDEPEND="dev-python/pysmi[${PYTHON_USEDEP}]" - -distutils_enable_sphinx docs/source - -python_prepare_all() { - touch docs/source/conf.py || die - distutils-r1_python_prepare_all -} - -python_install_all() { - if use examples; then - docinto examples - dodoc -r examples/. docs/mibs - docompress -x /usr/share/doc/${PF}/examples - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Example programs using pysnmp" dev-python/pysnmp-apps - optfeature "IETF and other mibs" dev-python/pysnmp-mibs - optfeature "Dump MIBs in python format" dev-python/pysmi -} -- cgit v1.2.3