gentoo resync : 25.08.2020

4 files changed, 13 insertions, 39 deletions

diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 77a16a9fb993..0c7df0627bf6 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,7 +1,5 @@
-DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f610cd582524c20fa88cbd592762f5e41a6abb36c6fc49ff6719b87322b12cc37c973d52847f9a400d8bf3024 SHA512 0b1e3cf839144b24e42974f973a8ae97e9b4c79df3a40e38f61cc4b5284ea41a1fcbdc9dd45ff2b402915acb1ffc908a1e1c45c12f93243211ef2349c9acf70b
-DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
-EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
-EBUILD s3cmd-2.0.0.ebuild 569 BLAKE2B 531a6555be566cbbe57325c6bd98cfb1bdffe32028addd89d67d72fe12d6dc66debf02acc58b061d53eff3a66af5488ca19a7b3eabeb6c71372629cbb32926b5 SHA512 4ecf2fa88755bc3d74a1a53960ad59dc31bde4dce32fc67babd92d6e6f5740d40e7b586d97e2a0bb4434b7a57103020f8b74e6ff4dac3a54fc5542b0bb966a03
+DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
 EBUILD s3cmd-2.0.2.ebuild 579 BLAKE2B 37142c3dbcb5ee3d9ddd574738fdd0df153e566949a0f1f7350b1ba2c02acd36e0a4398ba4683f12ab9392d86375a5e10adbf9b39d76a020e20e4b565af1b5ef SHA512 bfad562510e73393e0cb8ca22ca7b7853ed5a66b35105282eb6eeec1ccef38a0e051d45a62eb442b923148fd75a88259fda742cd28399fad9bfdaf31fe731775
-MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
+EBUILD s3cmd-2.1.0.ebuild 558 BLAKE2B 7742429c519ec2f0ecc6f973c58fae365e6792c27fa73285710e59b806cf966a30c9117a5dbf1710a7c0f7f637d50afbbf821864ab2fa67135c186713144937c SHA512 e08a88cb49ce97a41bd7e22a0f634e3673e369dfc171ebf88b71ae06bbca7264a84ac5fb1076d81e25e49d499af6ac34e99e71e9e63d3ba0d36119f60c9e8bbb
+MISC metadata.xml 684 BLAKE2B a51a67e94176e0c83d810b847abce27229e0769007d984fe4947a474f7d5dbc7a27169efa6caad265405e7e489351f5cc506fc852be88381f282bc7068bd70f4 SHA512 aa2ed58e516488adeb24cca0aac779dcb49c4ed6977a6b411df34f45a0e1b58a42aa34b0ff5faf1206bfb88f85bddf034dad43577512cff67e1aed2292f373e8
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 1e93066ae8dc..8d26ba9964fb 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -9,13 +9,14 @@
     <email>titanofold@gentoo.org</email>
     <name>Aaron W. Swenson</name>
   </maintainer>
+  <maintainer type="person">
+    <email>rich0@gentoo.org</email>
+    <name>Rich Freeman</name>
+  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <longdescription>
-    Command line client for Amazon S3.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">s3tools</remote-id>
   </upstream>
diff --git a/net-misc/s3cmd/s3cmd-1.6.1.ebuild b/net-misc/s3cmd/s3cmd-1.6.1.ebuild
deleted file mode 100644
index d94467370c51..000000000000
--- a/net-misc/s3cmd/s3cmd-1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-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 x86 ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]"
-
-S="$WORKDIR/${P/_/-}"
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
index 49035b03c3ef..52463ca60029 100644
--- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6  )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 python3_9 )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
@@ -11,14 +11,13 @@ 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"
 
-KEYWORDS="amd64 ~ia64 x86 ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/python-magic[${PYTHON_USEDEP}]"
 
 S="$WORKDIR/${P/_/-}"