gentoo resync : 11.05.2021

3 files changed, 84 insertions, 0 deletions

diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index a83d05555130..7fe0d34eb776 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,3 +1,5 @@
+AUX s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch 1927 BLAKE2B 76d18015437f5b9b2ec0ed2a573189a711ec055366dfe44d8a6557d0b240b9aad4f1f9a145b845a692acb93f3ab0c27b5cf70fa3626b90c6822ff026144e8801 SHA512 57302dc8238980ef28a273c2d91f5a099aad25855c246bf0dff2e64fede9efb8a6ad9ccd1a23df5e753e620080ac7ee4c02ce0f0c3c867210e5b49d53697e796
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
+EBUILD s3cmd-2.1.0-r1.ebuild 622 BLAKE2B 56f38ff9027933c54bdc421977e9c7b719d5583613da66250658e490ab1d18bda9f9c32f99a4764e221ba2ddd07c6bd7f35bafe059362963d50aeb4105fcdc3f SHA512 8901d811fb89a3ed9e7b7ba08e5c746d1b0fd7095eadfe65393acccfcaa9924da4d042033956b406b475f80b66be5f2437211faf43e76b03ae8836e320c9e29d
 EBUILD s3cmd-2.1.0.ebuild 548 BLAKE2B e3ed8df8e2c54fa963b625bd9394a89dc326403470eaac824e64d6bd2b912dee1a7bc3bdc46a0a488304a86e2f472abe0ac8e6a1163df128cffc80b16e4d37e5 SHA512 da0b560f6ed2acf6d7cd00c6f8c8bbb825f32e49f25e6f05503928e0bbbec7c6803b39cae35ff17e5a75bc9a6896015a0e5d713eb1ee6c3ebb08ef730d57580b
 MISC metadata.xml 714 BLAKE2B 2a7000a762de00a18e30b131609496815f2f47405684af84eeb5de35d6a29762eb7be897912ef0d75e1c43d14e01ab4f552cd77cc661553556277f0ca802b12f SHA512 7107fcd23b90ed1b5cf3d454112ab5d673569da5f14cd41f9f430b643ad0837fe6d713f9584a09547c8d33dbe8e5e3352c360b25dca99dfbb8f2eaa84b4007e5
diff --git a/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch b/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch
new file mode 100644
index 000000000000..92d90c6df9b4
--- /dev/null
+++ b/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch
@@ -0,0 +1,57 @@
+From 4806955e05011c3d981e91c12a95d84ab3aa65d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
+Date: Fri, 2 Oct 2020 14:24:09 +0200
+Subject: [PATCH] fix compatibility with Python 3.9
+
+getchildren() method was removed from the ElementTree and Element classes in
+Python 3.9. See the release notes:
+
+https://docs.python.org/3.9/whatsnew/3.9.html#removed
+---
+ S3/Exceptions.py | 2 +-
+ S3/Utils.py      | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/S3/Exceptions.py b/S3/Exceptions.py
+index d12c5c5..2710d82 100644
+--- a/S3/Exceptions.py
++++ b/S3/Exceptions.py
+@@ -126,7 +126,7 @@ class S3Error (S3Exception):
+         if not error_node.tag == "Error":
+             error_node = tree.find(".//Error")
+         if error_node is not None:
+-            for child in error_node.getchildren():
++            for child in error_node:
+                 if child.text != "":
+                     debug("ErrorXML: " + child.tag + ": " + repr(child.text))
+                     info[child.tag] = child.text
+diff --git a/S3/Utils.py b/S3/Utils.py
+index b9f4fd5..1f66f6c 100644
+--- a/S3/Utils.py
++++ b/S3/Utils.py
+@@ -64,9 +64,9 @@ def parseNodes(nodes):
+     retval = []
+     for node in nodes:
+         retval_item = {}
+-        for child in node.getchildren():
++        for child in node:
+             name = decode_from_s3(child.tag)
+-            if child.getchildren():
++            if len(child):
+                 retval_item[name] = parseNodes([child])
+             else:
+                 found_text = node.findtext(".//%s" % child.tag)
+@@ -122,8 +122,8 @@ __all__.append("getListFromXml")
+ 
+ def getDictFromTree(tree):
+     ret_dict = {}
+-    for child in tree.getchildren():
+-        if child.getchildren():
++    for child in tree:
++        if len(child):
+             ## Complex-type child. Recurse
+             content = getDictFromTree(child)
+         else:
+-- 
+2.26.3
+
diff --git a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..8fd4a4deed4d
--- /dev/null
+++ b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Amazon S3"
+HOMEPAGE="https://s3tools.org/s3cmd"
+SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-compatibility-with-Python-3.9.patch" )