From 44a6f923079d51164af67c7bc3f3e0db24658088 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 11 Mar 2023 12:07:11 +0000 Subject: gentoo auto-resync : 11:03:2023 - 12:07:11 --- dev-python/pefile/Manifest | 7 +- .../files/pefile-2022.5.30-remove-future.patch | 115 --------------------- dev-python/pefile/pefile-2022.5.30-r1.ebuild | 30 ------ dev-python/pefile/pefile-2023.2.7.ebuild | 2 +- dev-python/pefile/pefile-9999.ebuild | 2 +- 5 files changed, 4 insertions(+), 152 deletions(-) delete mode 100644 dev-python/pefile/files/pefile-2022.5.30-remove-future.patch delete mode 100644 dev-python/pefile/pefile-2022.5.30-r1.ebuild (limited to 'dev-python/pefile') diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest index d52001773f9e..8b60a4a3f253 100644 --- a/dev-python/pefile/Manifest +++ b/dev-python/pefile/Manifest @@ -1,7 +1,4 @@ -AUX pefile-2022.5.30-remove-future.patch 2980 BLAKE2B 7cd8d7e744d488cc8720ba6da84ccee4f481b58e4e0cd7f5810b873ee74a0b57fc2e578a4444dfdfc1948b16c75af94e1ccbf57baa4efbe1c244326bfc8d12bf SHA512 cc04fff8f25b008c2b966b6072548b90948881c59eeecb20fb6b285e72e56f42768f1853ef839a6a697c43d33d867e42c835ec1a007b6c3b2846dc973d9d109b -DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d DIST pefile-2023.2.7.gh.tar.gz 74852 BLAKE2B ddca4b8ef37af829bb1757eb4c4ba9f46c3914e05e6c13e13a8e5a3c88a608aba486deec9338400fddae4591867c0c7dcf7325cee14d42b1bb724751a3a2a7f0 SHA512 241d9846954f094ed39e61d80e7d8c1612829ec909650175e75657f9cf69c9bef9e2a115d4106bb14757125c0ffaa3e93abfb2f078e80326e78ac5818c7c2fd3 -EBUILD pefile-2022.5.30-r1.ebuild 856 BLAKE2B 28b50ebcf8e394594a6cd4118d094aef5535dfb5c8eb7bf8d1deb4cf0af8316d9dd323fdf489d48813ebe4c1fbdb3f7f11f64a98e9a66fc5caba162e22dd1beb SHA512 22fe3f60586914f61902df37dcd3c166a20326994c0a64d254e4bb3f6323eaf1f46257f40954ffe1c802df055c37cd3219454189e7209fd6cbb2ef7613015528 -EBUILD pefile-2023.2.7.ebuild 811 BLAKE2B e6afcbcaeec278c80f7ad8a7bc6233777386ea75e58cb86f1bc3a900a32288fb3f3cf60dc108c36ac8427c50019230a9ad39859c548e45f94b14cc568723ec66 SHA512 71ef8961a74aa72c16dfc92103aa8a698065e2735605de5ca546ca242651711703be6da299c66ae66d1ae677e2e4cdeb4b999959329c1bbc8f641b92fdd2f98e -EBUILD pefile-9999.ebuild 811 BLAKE2B e6afcbcaeec278c80f7ad8a7bc6233777386ea75e58cb86f1bc3a900a32288fb3f3cf60dc108c36ac8427c50019230a9ad39859c548e45f94b14cc568723ec66 SHA512 71ef8961a74aa72c16dfc92103aa8a698065e2735605de5ca546ca242651711703be6da299c66ae66d1ae677e2e4cdeb4b999959329c1bbc8f641b92fdd2f98e +EBUILD pefile-2023.2.7.ebuild 821 BLAKE2B fab817dabdefdab8d7a89d358cb3a003ae2613691c4180556dd0e44b748e12da94d9811fcb24f087a16b6958e5468ec20557d57b7560a783f78926d8ae8c0eab SHA512 3c44b38db1e4e787b92b786c52ad1351ba9c7b9dd29610f38d8d593f099e6cfc8f33e29ac79c3d9365ebd248fe4be18e0dae6de294c2e2061686adc0c0789aca +EBUILD pefile-9999.ebuild 821 BLAKE2B fab817dabdefdab8d7a89d358cb3a003ae2613691c4180556dd0e44b748e12da94d9811fcb24f087a16b6958e5468ec20557d57b7560a783f78926d8ae8c0eab SHA512 3c44b38db1e4e787b92b786c52ad1351ba9c7b9dd29610f38d8d593f099e6cfc8f33e29ac79c3d9365ebd248fe4be18e0dae6de294c2e2061686adc0c0789aca MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf diff --git a/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch b/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch deleted file mode 100644 index 7f7cc5d29d48..000000000000 --- a/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch +++ /dev/null @@ -1,115 +0,0 @@ -Bug: https://bugs.gentoo.org/888279 - -From 36bf63f1185b8407ff9b4ce8c1c8e8620d8ae30f Mon Sep 17 00:00:00 2001 -From: Letu Ren -Date: Sun, 26 Jun 2022 22:54:27 +0800 -Subject: [PATCH] Remove future from dependencies - -Fix: #348 ---- - ordlookup/__init__.py | 15 ++------------- - peutils.py | 7 ------- - setup.py | 19 ++++--------------- - tests/pefile_test.py | 3 --- - 4 files changed, 6 insertions(+), 38 deletions(-) - -diff --git a/ordlookup/__init__.py b/ordlookup/__init__.py -index c69aee0..8841d74 100644 ---- a/ordlookup/__init__.py -+++ b/ordlookup/__init__.py -@@ -1,5 +1,3 @@ --from __future__ import absolute_import --import sys - from . import ws2_32 - from . import oleaut32 - -@@ -15,18 +13,9 @@ - b"oleaut32.dll": oleaut32.ord_names, - } - --PY3 = sys.version_info > (3,) - --if PY3: -- -- def formatOrdString(ord_val): -- return "ord{}".format(ord_val).encode() -- -- --else: -- -- def formatOrdString(ord_val): -- return b"ord%d" % ord_val -+def formatOrdString(ord_val): -+ return "ord{}".format(ord_val).encode() - - - def ordLookup(libname, ord_val, make_name=False): -diff --git a/peutils.py b/peutils.py -index 34b98f5..4d4b2bd 100644 ---- a/peutils.py -+++ b/peutils.py -@@ -6,13 +6,6 @@ - - All rights reserved. - """ --from __future__ import division --from future import standard_library -- --standard_library.install_aliases() --from builtins import range --from builtins import object -- - import os - import re - import string -diff --git a/setup.py b/setup.py -index c8ab89f..206db6f 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,8 +5,6 @@ - import re - import sys - --if sys.version_info.major == 3: -- from io import open - - try: - from setuptools import setup, Command -@@ -25,12 +23,8 @@ def _read_doc(): - Parse docstring from file 'pefile.py' and avoid importing - this module directly. - """ -- if sys.version_info.major == 2: -- with open('pefile.py', 'r') as f: -- tree = ast.parse(f.read()) -- else: -- with open('pefile.py', 'r', encoding='utf-8') as f: -- tree = ast.parse(f.read()) -+ with open('pefile.py', 'r', encoding='utf-8') as f: -+ tree = ast.parse(f.read()) - return ast.get_docstring(tree) - - -@@ -42,12 +36,8 @@ def _read_attr(attr_name): - __version__, __author__, __contact__, - """ - regex = attr_name + r"\s+=\s+['\"](.+)['\"]" -- if sys.version_info.major == 2: -- with open('pefile.py', 'r') as f: -- match = re.search(regex, f.read()) -- else: -- with open('pefile.py', 'r', encoding='utf-8') as f: -- match = re.search(regex, f.read()) -+ with open('pefile.py', 'r', encoding='utf-8') as f: -+ match = re.search(regex, f.read()) - # Second item in the group is the value of attribute. - return match.group(1) - -@@ -89,7 +79,6 @@ def run(self): - python_requires=">=3.6.0", - packages = ['ordlookup'], - install_requires=[ -- 'future', - ], - license="MIT", - ) diff --git a/dev-python/pefile/pefile-2022.5.30-r1.ebuild b/dev-python/pefile/pefile-2022.5.30-r1.ebuild deleted file mode 100644 index f2bd1adb8c03..000000000000 --- a/dev-python/pefile/pefile-2022.5.30-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -DESCRIPTION="Module to read and work with Portable Executable (PE) files" -HOMEPAGE="https://github.com/erocarrera/pefile" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/erocarrera/pefile.git" - inherit git-r3 -else - SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -LICENSE="MIT" -SLOT="0" - -PATCHES=( - "${FILESDIR}/${P}-remove-future.patch" -) - -# Unfortunately there is nothing we can test here. Upstream doesn't ship a test -# suite inside the release files. The test fixtures in the source repo is -# encrypted so that only their CI pipeline is able to run the tests. diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild index 845b25ecea0f..1b9514683746 100644 --- a/dev-python/pefile/pefile-2023.2.7.ebuild +++ b/dev-python/pefile/pefile-2023.2.7.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="MIT" diff --git a/dev-python/pefile/pefile-9999.ebuild b/dev-python/pefile/pefile-9999.ebuild index 845b25ecea0f..1b9514683746 100644 --- a/dev-python/pefile/pefile-9999.ebuild +++ b/dev-python/pefile/pefile-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="MIT" -- cgit v1.2.3