gentoo auto-resync : 10:01:2023 - 18:21:10

25 files changed, 32 insertions, 492 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index fa3f2dff0e2c..0f17e19cd825 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 787bf4024b70..af022b655bfd 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,5 +1,3 @@
-DIST cmst-2022.05.01.tar.gz 3427199 BLAKE2B 3e48c45d5ce45259934af95eeb0a6462a62a7caf2c4eb030487c66d1c25ccb6204dd312e778a97310026dd3f7622b43c6b02c6dc750fe81400a756366be6d3bf SHA512 54a3cc6feee7e388d0b84967796b5d3306fdf0c5a1dde17ccaa582f4803841ea624894e6cd9afc4566d6972c1981e848dc12fbd0004669341821c068064770c8
 DIST cmst-2022.11.30.tar.gz 3486817 BLAKE2B 8c0d12a99188ec1aa16faed8d035f1b7c00d090725a547b90171f8e2f352550c64cb8acf4f7bd0900c281b307d361db4a1794b892fe593772ded60a0af6ba777 SHA512 09c5b14607824fab4e46c8f3648fc13951bcce08708ddb8f1574d4c71a14c69de7fbaa1849eba82d9525a02867f8b54cfdc3b073aa4dee1fdcb8845504640327
-EBUILD cmst-2022.05.01.ebuild 887 BLAKE2B ca3214162a928ab5975c15a02c29ee01bdad629aea7688a81015e3223d8e285ec061f6fe4c2f19dfb4c12e4fea21750c364a763e1002203c3d1a3a4636fb6e23 SHA512 e9bf2d363d20911881d689555e093ca4bc6cde6a733efe6d3d6fdd7292630fc9a24c63a60e0cd5470072de8aa1bcb7ba2879254e1305e53b6f624869bfc263a5
 EBUILD cmst-2022.11.30.ebuild 887 BLAKE2B 018a8bff9caebb57cb0bcc7651b3cb4d4892c988ae074aa64165e7a9a2d43ec6f4d9eb7771f4182d5c0a2ec666aa0299486b104246bd77be1f9674a88e73f7b1 SHA512 7bd192d44cfc14d5f06b5d01e849cc15f3614c54c17cdf60437ace7d59f46f367bd81a37c530ef519135e11249e9e70e38fd1a3234286af4e06c3b0af89b63e8
 MISC metadata.xml 390 BLAKE2B 19055fbf6cc2b268ff117e4cd4e39c894452cd7a3f9c71a113831a142ee4458aae99f86497fc85ee5e29ee73a50d2363ce816e46e2cf3cf47e6be51658d882d2 SHA512 fcc4db887275f29a69ddb8d731f3bc1516734b75bb5ce494d2ddfc13f951a7c1ce9f715383c62725919755b61488943f91c1286d126fb91a24176c24e0e3dcaf
diff --git a/net-misc/cmst/cmst-2022.05.01.ebuild b/net-misc/cmst/cmst-2022.05.01.ebuild
deleted file mode 100644
index 45b56952a1ac..000000000000
--- a/net-misc/cmst/cmst-2022.05.01.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/connman
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5 DISTRO=gentoo
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${D}"/usr/share/licenses || die
-	gunzip "${D}"/usr/share/man/man1/cmst.1.gz
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/connman-json-client/Manifest b/net-misc/connman-json-client/Manifest
index c9978b0088c6..b9551d316e6a 100644
--- a/net-misc/connman-json-client/Manifest
+++ b/net-misc/connman-json-client/Manifest
@@ -1,4 +1,4 @@
 AUX cjc-fix-for-json-0.14.patch 1554 BLAKE2B a521777f66e34a425306c03f92096731f8ad93f6001930efabafbc4764ce698110a482063f53dcb0eec34a3ffae871407ef1ff53a6a918a6c809decee9b85cc7 SHA512 6a545259c2ffa4f9c5e628566890264aaf2be908e2a2a3313812777a28e1b57a60f1c8920f88f25a0574fe1a2e101c8dd020b51cb22ae1ebb851cca3b0f3bb50
 DIST connman-json-client-1.0_p20150721.tar.gz 55520 BLAKE2B 81f81721563bb8a7c4e604e8a036b162329f1334092f345438c34f787bceb8e548d69e0c206773b880799d1327858275bbbade59d1b84271e4fc05372937ce7a SHA512 77cfbc9f1b57ff5ce73a80f42198bbdb7120db6510f3f33251465ed83d1fac3b2bb41e3959f43cc8d274d37c8da375009a07e9003664482136eed64f5b32c0bc
 EBUILD connman-json-client-1.0_p20150721-r2.ebuild 788 BLAKE2B 88ba3ed6a0bc687211090152b38ea4f6a39435fbecc9c6555d77b6b85fffc65590436feb12bb3ff7f57cc501bd89c674040b23a3219bb077102c4070f0294c32 SHA512 1277acea76456709d7863d9e515960d6692b3c88dabb66bb3bab152937a3377bdf4195e5bd23c40f695a8fa2beddec5e28ddad03116bc3b9f7451d6744d397f2
-MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
+MISC metadata.xml 337 BLAKE2B e5a3c97f738fc2c201f8f514b10061d8a25c1daf2b8f771c354f12cdad1d0992671ba128f6f9a15c925db3d5ec6c24422a7b0253af534c1842e7e532dc9a01e7 SHA512 02f8d70dde6c20b5d59c44751012c863fb6ee82786e5449f69877110a38fffc344687d11ec214c33113c3cc74d39385166df3bcc2af4cfe69d430a878c16e102
diff --git a/net-misc/connman-json-client/metadata.xml b/net-misc/connman-json-client/metadata.xml
index da20bb112a7c..3c116b1665f6 100644
--- a/net-misc/connman-json-client/metadata.xml
+++ b/net-misc/connman-json-client/metadata.xml
@@ -5,4 +5,7 @@
 	<email>bkohler@gentoo.org</email>
 	<name>Ben Kohler</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">eurogiciel-oss/connman-json-client</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index 9a71f058c523..e4346171417e 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,3 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
 EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B d35971123606983189e7a891dce12bfc7b6c7c31051d29924baa7603e616be6eabae74558ba3801174ee79eed526502e517bfa0df58d7b1a7aa79c566b277608 SHA512 b3166f67bc5454ebab958b097418cea3662671ed377f3c3863804f47dfcf954b37dc4563756932f4c8ea6a7a63e89a9476026c7ea94c563139619719cad6056d
-MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
+MISC metadata.xml 324 BLAKE2B a1e1131d5c485ced55b0c4cd64ee3617e4c88464edf3f3b4ea3986f80203cc3adc105896960ce50f0c940883c3d4cc1466045b6775ec1b6192c5338075cdb2d9 SHA512 321f9aea21a5df747bf981b39851c4119fec7816b8a0383f048eb36c13c0ab14bc978b6a396d7ad81c53e9f24af23fbcd7e7b797d432fd720bb135260492b90e
diff --git a/net-misc/connman-notify/metadata.xml b/net-misc/connman-notify/metadata.xml
index da20bb112a7c..4a77a7f66f54 100644
--- a/net-misc/connman-notify/metadata.xml
+++ b/net-misc/connman-notify/metadata.xml
@@ -5,4 +5,7 @@
 	<email>bkohler@gentoo.org</email>
 	<name>Ben Kohler</name>
 </maintainer>
+<upstream>
+	<remote-id type="gitlab">wavexx/connman-notify</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index c2e6a758545b..68cf685fb250 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -2,10 +2,6 @@ AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c155
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
 AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc844128f68f67d2817c6ffd2189b6cd5e40357ed15580f5bdd68a68148faf77c49198040e767af4c57f49163c5903f0 SHA512 53c20d01d60be0d560c5e15f26bbe206bba59ad97df486b8c24409e2a58b13093b09a4601f6d8add9ec4f5f01faf9e5c3ecee00e9818e5de84f7df7d39b5127a
 AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
-DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c
-DIST gsutil_4.68.tar.gz 4459899 BLAKE2B 9855d379ba0483f1a33e4e05546444ff492c72d241ff0e5ca4f6c798c91b0c8d729247bf5fbaa39c411eb7a7e3f1fa701363898b903ba11c1bdf41c7e969c44d SHA512 b4af124808f34b5c0aa1d31b6d1bdbdeb451d39a246d4f2876ef664b6b485cdc5dc63bc3992ca4b7b33c72a00fc5119b931625e2c3230970bf0baa6389715e39
 DIST gsutil_5.9.tar.gz 11620858 BLAKE2B 09f2a79d14458a6545c45df23bd86a2769a00441ff03ae47a984cf18ae20c38e7b725f148c4e1d465f850f89871ad70b29463b8c829674d9d70d330b008595c7 SHA512 4916f3ac9c00c310a3dbc342ea0ab245cdf6952a4cee4e5b810f73254fb93439bcd7be35acbedac43501c3f19d8851848eeeff5b6ada6f31d93d478809518e35
-EBUILD gsutil-4.60-r1.ebuild 3072 BLAKE2B 267dbbd52f525a90532b151eac417b5ad3abc88705b698c84ba765a4f71494ba39e858c0912dbba1f33fb56ed83f7e055d710d2330563c3d74838c134de01aa3 SHA512 c4c536f87b66a699b8b28da4b26245f923b9132e2f69369cc53dbe0baa051e15089a92b03031428b742b1f7ec035a2b09148746aff80822c508191f07fdbe93b
-EBUILD gsutil-4.68.ebuild 3037 BLAKE2B 0fc9cdc2fbb439682e80a3c3333c3ddb79a9065285f36e94199a4601eeae16d7471002fb5d3af3291bf77122aee40bc4658ded78c0f15234e0f3848412bb1bee SHA512 fff0bf4340e89fc6803725e569e68314ffe96f7113ba5d8c7d29c46e158b2dbb6567f79f1b321949c143dbfc12bf9d46e13711c33abc56e4d80a09e975aab1c0
-EBUILD gsutil-5.9.ebuild 2921 BLAKE2B 985dd61bc358cacf80b046d494f3dc237e5eaa297d079dac988cb0c9a853dad383fb39cd683a437d1cc260725ea0f39c9eab569db044322a1d5ea67843203673 SHA512 8efc4a466896c3208a1b8ba233d0467a9595ddd59d709d75a9a9ab9cf79286ae9bb4987fae53ab56d105d4468695928f42635467b4b832f454444844991c8355
+EBUILD gsutil-5.9.ebuild 2916 BLAKE2B 1c8f01d2ff10c5d1101b4ab7dd571ecf3c19b1a690f1e43db2805ff14ec37bd405b0e9fbeb990d03969ab61a1924ab88270a945500f33a3298d057890533df47 SHA512 104332e6fb6d25a0493a504e99d27a4d2490741c8e7b75325fc5485edaf8a83a3991eafe933ac69b6ed4298eb385a8dde8977ef93fb8bd0930be60acdb6ceacf
 MISC metadata.xml 515 BLAKE2B 3e6c5322e5a945b1ea9e073ba98e135fdebf5d28f34bd6e5116f11668bf3505a6b8ab6f770348f2318c2bd3aa3aef782738e14ef6de60ee7c6fc1413a4a5a9c0 SHA512 53a143192dd605277e3ac4b8875400fbbcb892964e521de8768894f40580169d8ffd68f715a97f692b881ae6dc578a79e8d4573528bbdd881ffe4112d0d59734
diff --git a/net-misc/gsutil/gsutil-4.60-r1.ebuild b/net-misc/gsutil/gsutil-4.60-r1.ebuild
deleted file mode 100644
index 7cd73f33bffb..000000000000
--- a/net-misc/gsutil/gsutil-4.60-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
-	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gsutil-4.41-tests.patch"
-	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
-	"${FILESDIR}/gsutil-4.50-tests.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.md CHANGES.md )
-
-# needs to talk to Google to run tests
-RESTRICT+=" test"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# NB: We don't delete all of boto/ because the tests are imported by the
-	# production code.  The same reason we can't delete gslib/tests/.  We can
-	# delete the main boto library and use the system version though.
-	rm -r gslib/vendored/boto/boto || die
-
-	# failes to compile with py3
-	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
-
-	# monotonic is only used by bundled fasteners that we do not install
-	sed -i \
-		-e 's/mock==/mock>=/' \
-		-e '/monotonic/d' \
-		setup.py || die
-	# Sanity check we didn't miss any updates.
-	grep '==' setup.py && die "Need to update version requirements"
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady
-	sed -i \
-		-e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		gslib/tests/test_cp.py || die
-
-	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
-		gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -i -e 's/sys.stderr.close()/#&/' \
-		gslib/tests/testcase/unit_testcase.py || die
-}
-
-python_compile() {
-	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
-		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
-		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
-}
diff --git a/net-misc/gsutil/gsutil-4.68.ebuild b/net-misc/gsutil/gsutil-4.68.ebuild
deleted file mode 100644
index e907dba14782..000000000000
--- a/net-misc/gsutil/gsutil-4.68.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}]
-	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gsutil-4.41-tests.patch"
-	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
-	"${FILESDIR}/gsutil-4.50-tests.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.md CHANGES.md )
-
-# Needs to talk to Google to run tests.
-RESTRICT+=" test"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# NB: We don't delete all of boto/ because the tests are imported by the
-	# production code.  The same reason we can't delete gslib/tests/.  We can
-	# delete the main boto library and use the system version though.
-	rm -r gslib/vendored/boto/boto test || die
-
-	# Fails to compile with py3.
-	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
-
-	# monotonic is only used by bundled fasteners that we do not install.
-	sed -i \
-		-e 's/mock==/mock>=/' \
-		-e '/monotonic/d' \
-		setup.py || die
-	# Sanity check we didn't miss any updates.
-	grep '==' setup.py && die "Need to update version requirements"
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady.
-	sed -i \
-		-e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		gslib/tests/test_cp.py || die
-
-	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
-		gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -i -e 's/sys.stderr.close()/#&/' \
-		gslib/tests/testcase/unit_testcase.py || die
-}
-
-python_compile() {
-	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
-		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
-		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
-}
diff --git a/net-misc/gsutil/gsutil-5.9.ebuild b/net-misc/gsutil/gsutil-5.9.ebuild
index 2dd866b29dda..a35f72008068 100644
--- a/net-misc/gsutil/gsutil-5.9.ebuild
+++ b/net-misc/gsutil/gsutil-5.9.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..10} )
+PYTHON_COMPAT=( python3_10 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/net-misc/ncman/Manifest b/net-misc/ncman/Manifest
index cf1264035ff3..b73bf7f0b070 100644
--- a/net-misc/ncman/Manifest
+++ b/net-misc/ncman/Manifest
@@ -2,4 +2,4 @@ AUX ncman-fix-for-json-c-0.14.patch 1586 BLAKE2B 37c63f15cea1e7ed4b95d54a005ae67
 DIST ncman-0.0.1_p20190327.tar.gz 51925 BLAKE2B 020092e64ccb55563cc891699550911411b67b749a49fb6bab4962857b59c93fb05109afacb88a5e42abc9030683af66aed2e44aaf0bd1cd8931c9df019bdc52 SHA512 24a3b3eec57987e290cc319e409e8da00f14e260360c606b3a89ee2e092976d0b1c256a4b1be40870bcaea620a482477c4aed53fa0e1719c297fc9edd524235e
 EBUILD ncman-0.0.1_p20190327-r2.ebuild 855 BLAKE2B ccaaa376e826a231830e2991b05a75a1b45fa88c31d77adf8eab513adb761f573bface1b8304188ad55d37d4e7b69d7d962a4340813d5ff28e8649935bf8605d SHA512 350276af6cd23c7c345d3ba3b2a14685f397a19e9a68b71f637e0784fd44866ab7c6f76072ea54b0069b1ec5f81a87b4f31d1c2e5003dfcfc4ff6eaa599cb2e6
 EBUILD ncman-9999.ebuild 756 BLAKE2B 5e763d6ee99f25641fec73594f59fa808c56e57a1cd12e424c85f48ad917f4215bfd8db2421f7b552d22c305648451fa2f2174b15c58cdbe25087111bb682205 SHA512 5eebcf6839e40d0abdf91a721f36d172ce69fd306b36ef021c4ed498fb9c7e3480125ea7d084f852df8485fdde0ecba32d1658085f61e3a0ef495c7b11957ffa
-MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
+MISC metadata.xml 314 BLAKE2B bb248bc467f80b514fbf74187c552793fe0249e4c959d35eee1553bf1986857699de8336cbba6a4c8d81c53c88889670cae1a29851db616ea3b5644399141b58 SHA512 81b9ae6c9b3045ecfe77ff86b77ae135b17518d33736bbe69d02d85f242fe9f2c82b20ecf070dbd8be15a7c8bfab2247b872a24e5645be63a29ae59c224ad75f
diff --git a/net-misc/ncman/metadata.xml b/net-misc/ncman/metadata.xml
index da20bb112a7c..f38113d761f5 100644
--- a/net-misc/ncman/metadata.xml
+++ b/net-misc/ncman/metadata.xml
@@ -5,4 +5,7 @@
 	<email>bkohler@gentoo.org</email>
 	<name>Ben Kohler</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">l4rzy/ncman</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 33c6f6798008..25cc9d768943 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,5 @@
-DIST Remmina-v1.4.27.tar.gz 3479987 BLAKE2B 96d4df06558a267db8605dc03de729061e303f9cebec84369ec3bdeeb19d4a377accaf224603ff9ba79bb9f1cecfa66519e6e02e328f42d24c46bdf3e1fabfa6 SHA512 2fff81a1a721b8ca87698697952bb1080cde6affc86c324f6fc30cc329ead57f0e617c39efeeee30890ad4812e719cee22a0b84df43aa1bc7db571607f208bfd
-DIST Remmina-v1.4.28.tar.gz 3553916 BLAKE2B d27598c57e1d68c6c8e4da0a4d2f2cf056cbb2f532297ef01881e87a1c11861ac2dc0e0ee490da4ace18140dcb1d04650bb54635a959bfe828de363b64f98558 SHA512 58f84044a5285edfe739b0f6f60cffe05c79e57453d39173d6c17ba9e5e63e9938a19ce69564cf2a6c254d9f2b6bb426d7518def5c961b3c296f2897509fc931
-DIST Remmina-v1.4.29.tar.gz 3557543 BLAKE2B 9660b4c0a608509fa06f7f61ba352b4bebf78e7123b5a2d1a21c242782ac03bd07a8cd677735fccc633749f92c57bbd72460a12dabd08f520ddd977184758201 SHA512 477da48a88efe06f4fa68a6054b4dba83d5e628a1ccffc6f14a712b49b8ce8af44ab0eef4c1e8e078e55d1554132f3539f331a99c30b8302f5b71fc96cb965c6
-EBUILD remmina-1.4.27.ebuild 2701 BLAKE2B 8f84e03772910389d20788ddf71596c1d56f9793004f4164f486070eb32b480475065c9763deb043f1b7709d373e50db0d195c0c7fc71a0b60d39c29c8e4c853 SHA512 79302769e75238fe57a7c1b27e68b3acc388dff06d22eb9c4c2fc6b7b38120677787e81a85e01f04100c2a116e4159ee51c08a18982c98f5adf45ee83d0f7453
-EBUILD remmina-1.4.28.ebuild 2699 BLAKE2B e76606d74a5c57116b2085a6be50a2026582755f1b4cb6e93cd968f6159544cbcd7a5b8c5ad801e8c4b5406938f3c66bdf4173fb276a36ea1785291bf29af9b9 SHA512 fd6a1bda4b6adea53dc9e28fe15221530bafa8819252fb9ca9ae1111abd35b2c94ea8bfcf6650077f6ccecfaa6ebee299deca9ce02770b1f1d7afecc0ea2a097
-EBUILD remmina-1.4.29.ebuild 2699 BLAKE2B e76606d74a5c57116b2085a6be50a2026582755f1b4cb6e93cd968f6159544cbcd7a5b8c5ad801e8c4b5406938f3c66bdf4173fb276a36ea1785291bf29af9b9 SHA512 fd6a1bda4b6adea53dc9e28fe15221530bafa8819252fb9ca9ae1111abd35b2c94ea8bfcf6650077f6ccecfaa6ebee299deca9ce02770b1f1d7afecc0ea2a097
+DIST Remmina-v1.4.27.tar.bz2 1975470 BLAKE2B 09ce4cd29f476a307dce4c35d8304b8383db016b63646375d50a86051f6dd99fb4775700e3d8887dbbbece72b90dcbc5987b0705e2fe8f5b0840bba1cb29c92e SHA512 44bc067eaf2c4c10e42182aa7c3ec2aa18ec5c0ce51a2fc765884cbfc11261d3c0db537b1674424aa092caf171e647714dcc8af6d813273f7b96876a251e0575
+DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
+EBUILD remmina-1.4.27.ebuild 2702 BLAKE2B c481ef70b489d8d35fcc94baba872cdfa21b1111ad853bf15a5928ab4d35da724aafd968803ef824cd13736d523973fa1db0bc01ed6c0d85168c82f149d40293 SHA512 454453b963eeeeb1be58aac6db22ad4909672b0d1ab238cd911e101aeb5883776ab609951422345b2ae4b7b9691a90209e07505c195ce6619f01baf91fa55ecb
+EBUILD remmina-1.4.29.ebuild 2700 BLAKE2B 0189ecd073daab151c4dd42e0d7c4edafeeead44e2c8fd17f3bc26dfc6dd38e828463bd4d5a6c738be31f463c8620373f00ad290d9e0b7c228910672e1ca5b75 SHA512 dd26f3906654ad7c822e9282249172713da221a4abe3d694b7a04e322a1700539558248a8e70fc049a31d2e6ddcbee4b8b3045892c04d849cbe2bf7c16f2a727
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.27.ebuild b/net-misc/remmina/remmina-1.4.27.ebuild
index 616bcb36c273..893bfcc13437 100644
--- a/net-misc/remmina/remmina-1.4.27.ebuild
+++ b/net-misc/remmina/remmina-1.4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ MY_P="${PN^}-v${PV}"
 
 DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
 HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
diff --git a/net-misc/remmina/remmina-1.4.28.ebuild b/net-misc/remmina/remmina-1.4.28.ebuild
deleted file mode 100644
index 988d70ef89aa..000000000000
--- a/net-misc/remmina/remmina-1.4.28.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake optfeature python-single-r1 xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls python spice ssh rdp telemetry vnc wayland webkit zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
-	python? ( ${PYTHON_DEPS} )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	spice? ( app-emulation/spice-protocol )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_FREERDP3=OFF
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_PYTHONLIBS=$(usex python ON OFF)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_X2GO=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-}
diff --git a/net-misc/remmina/remmina-1.4.29.ebuild b/net-misc/remmina/remmina-1.4.29.ebuild
index 988d70ef89aa..c86d19979b6a 100644
--- a/net-misc/remmina/remmina-1.4.29.ebuild
+++ b/net-misc/remmina/remmina-1.4.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ MY_P="${PN^}-v${PV}"
 
 DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
 HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
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
diff --git a/net-misc/s4cmd/Manifest b/net-misc/s4cmd/Manifest
index 59215708eae4..aae508aa3e62 100644
--- a/net-misc/s4cmd/Manifest
+++ b/net-misc/s4cmd/Manifest
@@ -1,3 +1,3 @@
 DIST s4cmd-2.1.0.tar.gz 39312 BLAKE2B 9d2d533273543153f2bad69362933315f65c5e70bd45c102e42b1b733989815239ae4d027ac08d658f03263bd9dd75f1f6db802b5f38ed3256da5e7c9f48558c SHA512 05e930e2789ce8ab280dcdb2f08e4162930d946d2ed2e4f1c754c8b875375774779b73729151bd23d9bf3736bc48f7626fe53df66aff71dd11b32e90e9355470
-EBUILD s4cmd-2.1.0.ebuild 690 BLAKE2B 1ca66d29d471440f52374f02ba518cab38a9ed89a8cd9afc5d7c9f547e0dfaa4b23feacf93d174897019635e69890ba5c1f3c17d7a2b8419835f3e6f8c9ca2af SHA512 44fe9a0adcc28d53b9287cdaaf4887e0a0ae6e5c801fac38b8daad86b5d20e2e3a1b19bb28999997a3a689fc475180549a5bffedb2b548cdbe8658d09654f2ba
+EBUILD s4cmd-2.1.0.ebuild 660 BLAKE2B 140a7a0270a332711576c7aa280e5f6cadb68bf892e3b884b7987d31e2d42675b847aa616c736821d8b469659bd96412fd5f9f3b1c3564f8cc2b64b7d03e83be SHA512 60e2bbdd89cd6c8b10f6c6134bd56e7832f5788d980dd2f23ea7388f783422688108e17cfa74dee67d18e74cd2c2f0721b81a895fa946c07da7e9d9c097d02ee
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/s4cmd/s4cmd-2.1.0.ebuild b/net-misc/s4cmd/s4cmd-2.1.0.ebuild
index 27794ebca164..ad0c96c26eb5 100644
--- a/net-misc/s4cmd/s4cmd-2.1.0.ebuild
+++ b/net-misc/s4cmd/s4cmd-2.1.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_7 python3_8 python3_9 python3_10 )
+PYTHON_COMPAT=( python3_10 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 bash-completion-r1