6 files changed, 6 insertions, 115 deletions
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 7226ec2f7179..2a0c391e5453 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,9 +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
 DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845
 DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a
-EBUILD s3cmd-2.1.0-r1.ebuild 623 BLAKE2B e7ed865ea06a89ac2d935a4c4352d8a4078e1b97a6110b725026a92b57c1d4df2f30d15ba3bcb9b45e9eab0000632ea62e4a552223856a041817f56670ad7c60 SHA512 86170012fbfa056e98c56aa13b667a5eb8a56c05ff7aececf46d085039c95b4eea7d9f932eb677c24fed0175c1cdc922dec7dbed1380936091e8fb01e4f6870d
-EBUILD s3cmd-2.1.0.ebuild 551 BLAKE2B ce6c97317d2ae450ac69cda6e70c187c922ed94693cf3b30c8f9cdfd5457c8142d86b8414a2785f33ef9f12eb144ffdb649837a4dcaa7b53fe31187c42170a39 SHA512 1eb368993f366556458963a7c5cd3a9fa1abd778e504dc236ab46d89383d8ca2bc21ddeacb22a388230edbd3d24bf3609648af0d9173a178c2324e2b64fe45ec
-EBUILD s3cmd-2.2.0.ebuild 679 BLAKE2B bc39c9047c780651bf028328f3507d93b5fac697c6dd6ec36c8838170f10661af57a21be803b99e9bba600985a492f5a775fe6949595db16275d02e9702a9442 SHA512 c99499ed69d586fc1e54a29950fa17c184b53d9315b20f303099f0648bc512bd9b2fd57059d8672439a977d1a28f3ca516dee894466832d2acf2a39915b023f2
-EBUILD s3cmd-2.3.0.ebuild 681 BLAKE2B 0b65aa4064e85230a5608cd19b7393bc2b066afaaf09d4b91c65b448c004b636d953f2fca5a3766245b778d3aec95c51e9f75ae02fc137a9bbc876c06be10148 SHA512 b00303eed1a5aa124f7f77457f4cf5f7279ecb604e9db044260190b5754ec2ba4cc335f40345e408319e88eb7aa7eb42f36c61373d5f53d36a4c4736e1aa9a07
+EBUILD s3cmd-2.2.0.ebuild 674 BLAKE2B 9f9b7d82fa49a30972d1459df8e974c719072e089085f87a06aea04f18711dfd0ab11179965edea3d15e9474efbf386fa6ce06373e380d968733c4c921b194e5 SHA512 fe813bfb528da9b94cb6578da6d99ec9f9b496069ef920ff53e820ab388f317d6b72d7fbc7aea5298e4d78631645b75b6c6fba69f9988bd02d24ebf78b907f1d
+EBUILD s3cmd-2.3.0.ebuild 682 BLAKE2B c9d460ae54c47bdb7d929c89718e9f73c44da622631c3af8a27f040d73686685575f3a0802457175f607e4d4d7a979b4dcfac121b547aa6d80474a8978e6d687 SHA512 8bc52b9b7858920b1e4cd51c07ee87f89b814e250b091e2591b69194df915b02694b4d36d42f69de00f67b865f711d0e549773aa8cbd083c70b3f731b93a5331
 MISC metadata.xml 795 BLAKE2B f1d85ae68ca459fbf61bc0cfb20da9e3d5380f33f8ebbac3335ed7432e50a44612238331ceb725c6e6ec116a19a6cf6d41bfc4895f9a892e698dc2ccad185d51 SHA512 01531459d573097f668c7c584732f17bdff1dde9d49b2e9c424134e346f0b430957a64bfb4075ef41b08ca1f86d5b6a6b5285de81f9f1f9d3d52bb081ded06eb
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
deleted file mode 100644
index 92d90c6df9b4..000000000000
--- a/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 956b31286cec..000000000000
--- a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 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" )
diff --git a/net-misc/s3cmd/s3cmd-2.1.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
deleted file mode 100644
index e20c06c77889..000000000000
--- a/net-misc/s3cmd/s3cmd-2.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 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/_/-}"
diff --git a/net-misc/s3cmd/s3cmd-2.2.0.ebuild b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
index 6071aa7c9675..abdc01352a90 100644
--- a/net-misc/s3cmd/s3cmd-2.2.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_10 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/net-misc/s3cmd/s3cmd-2.3.0.ebuild b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
index 7a4b555933e3..83925aea1a35 100644
--- a/net-misc/s3cmd/s3cmd-2.3.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1