gentoo auto-resync : 10:05:2023 - 17:43:52

9 files changed, 3 insertions, 136 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5648274a0a1d..136db03dbf78 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 5c365f162727..8645bb08025f 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-3.0.0-nih-test-deps.patch 3435 BLAKE2B fbbe2bbd8b05dd215b2ba413e208a96fbd1df9904271980658e1fae100e6fb1d049e15d582a307364d6416090b97741cbfc8d7304e08d7b7bbfbd70e0f1a1522 SHA512 76cca0e404215e505d6ceb650da796862fd87ab460e1a65438c62cb926af4a3ebb8f603bd26acc1a6d1a1a37e6090fc01edc4ae7a7f81f18105d3d9fce03545d
 DIST paramiko-3.1.0.gh.tar.gz 351910 BLAKE2B 7350626f3a8e54d8950085cbd8253f5564355abb4db7c65113c0df22674e3df0081da7299cfad779f1fcf9569b01720b6ab5dc2bde32c4a71500e79910caf4c8 SHA512 1a556a5b7a6ebc72a0c61b59f326a95c9f2784d74fdc1a171455867ba7b4b07a15741e168747b5a3a225685ad069e2d58021f54dadf7feb00f8acf65b0c07d51
-EBUILD paramiko-3.1.0.ebuild 1235 BLAKE2B 36a9f9d10eb7a60962f30ae039ccb6f1b2146f9545cebc901db59544fd3251f1c61d25b4b94c2874151c92852cf2555f84894dea34d529cf43b7de9d3a2ccac7 SHA512 e0573656798999815fbdbdda8938c3b9eda4b17f2de32f5fff9a37465bf1ae220380d6daf0528af2250f71e804efe707ed4b20a99f791a1574cc3c17fb2aff51
+EBUILD paramiko-3.1.0-r1.ebuild 1201 BLAKE2B 83a9d97c92d63e3518f4b0f73d0400119f39491277bbe2a2551c90fe227095ec4645f5df1d6a1200ca03c0463044426a228113a4a2f4d240ed6b94f4a1d2276e SHA512 bbf9e0f03a25c1b32b42c562aeacf423c62f217fa584ad8796fd73a88e52c46926f610ab294877c15a367357605763a2d9153891dbe446bddc5a0d953711989e
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/paramiko-3.1.0.ebuild b/dev-python/paramiko/paramiko-3.1.0-r1.ebuild
index dd2a49a105fc..380997434a93 100644
--- a/dev-python/paramiko/paramiko-3.1.0.ebuild
+++ b/dev-python/paramiko/paramiko-3.1.0-r1.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
 	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 9f38a6756431..c648254952be 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,9 +1,5 @@
 DIST urllib3-1.26.15.tar.gz 301444 BLAKE2B 2681f0290a4f8b335dcdf384a0c0692cf51e88ea829f80c8c857be328b00c618978a84957da4e23826e4597fe90764eb36ab9acbbc33f9a6ec8df3e3ff3f4d48 SHA512 b6ddb29c15b2d729605a6acb7c602f18c75a937cdfe9649d35d790a59fbb1d96a8d68975ba0a4c073c9f1750e383c67b7566dbcd81b3e8611501e9f4153e9a2b
-DIST urllib3-2.0.0.tar.gz 276792 BLAKE2B 3f5966ea97f1ddbf73ef4d1d292b426f502a211fef6e2bc354a88dc95766faf99a5dd34cb891147c580a03b8c5fb2dd7fdee22988bd603db046c03245c850904 SHA512 24e1b34d266983cf4e1556cbe026cc62d7fdb14c5ec5dace800e0b40e0a4f898d4df1679de351d14598ab0f72eb1bec74b6d2976df628b786f4bab4cb4380044
-DIST urllib3-2.0.1.tar.gz 277241 BLAKE2B ae4f323bcae505f2e177fd6c4764af78f5b98140366ac6e14f27eb0f5c55870f39bfdab6466628cd2fcf2171cd31ed6c82ae3f42e109834764aa87cfdd13f4ca SHA512 58b784052530f1447c8fca3db3309b127a7db352f8f6800765b92efb02762502ea9e6d50fee5d8c297a9ea0d6861c91f6db7254eb955941f0239d56f30d2dcc5
 DIST urllib3-2.0.2.tar.gz 277703 BLAKE2B 1c7935a6aca8e60ad212eb35ef76009b75a8d080b1a572fe229e94a200e75c352ab41d831dde3d4a4643ecbbe54c2128f9d9ca1850d978fd1730d6d730ce3ab0 SHA512 874674342259f2f9b77b4aac90bd525ea50d4b6134008c22eb0fe7a04e688797564c3ec8e556600f75416df2983c972867e8a569d5d85a8dda748948217af38e
 EBUILD urllib3-1.26.15.ebuild 2315 BLAKE2B f66ea329585eea090f339bd996900c5073918b6efc38fbe1d6d2eaba835c426149ae274a33659d6e5cfeeda87c84048e210456c7013006f59e464dcd9a38ae25 SHA512 21bbd772075249cf7af1b2509374186af3fb37341a89098717dbc91caf407cd65ea700a0d205f30c12277f509bf966123719a014d496dba2175eda95ef26a123
-EBUILD urllib3-2.0.0.ebuild 1891 BLAKE2B bddebc287f54cfe2a335ced1da9f920fbf8a6b74219e108ef928e83fd9e5f20ed02469c447ed5d0293ccffbbeab169476940409464383607ff2472a8a3a9c26e SHA512 45b78c8f82dae41d8e51495faa15bcc4edde0b0eaf53fbd8b42a484958a5bcf28c3f974f2a27ab6b92f33190e7ed6cd5c431becb5b94f885476d214d7e027daa
-EBUILD urllib3-2.0.1.ebuild 1891 BLAKE2B bddebc287f54cfe2a335ced1da9f920fbf8a6b74219e108ef928e83fd9e5f20ed02469c447ed5d0293ccffbbeab169476940409464383607ff2472a8a3a9c26e SHA512 45b78c8f82dae41d8e51495faa15bcc4edde0b0eaf53fbd8b42a484958a5bcf28c3f974f2a27ab6b92f33190e7ed6cd5c431becb5b94f885476d214d7e027daa
-EBUILD urllib3-2.0.2.ebuild 1981 BLAKE2B 012dd8514e86af6e9823b11360ba7382d9f5ec4adaee869f7165f1a55518a1cc31a16f3e1d4c27981ef1008c6a957580fae4684b438715866ee0b6aebe1258c9 SHA512 35a7347127186869f6da9aa14a9f471f918b044041bb84270187768877230931c809bfc0b8b6a1375cdb1207a065a5f885404bebc017253de1224e42924d5548
+EBUILD urllib3-2.0.2-r1.ebuild 1947 BLAKE2B 8de4b4e4e3cb744bf2eb43c9bbcee7bce1feb9bb92a540f4551d28ccfa69654d2ae9f1c6c0dba77725e1757e0e6561d120607f3f4b7eca1ef7cee78f0a1d8663 SHA512 a67410a45745c585c8306f733ddabfb238904426ffd032a1f05bea1dcb1f05ae208aa50a144779f61d503e7413191d704b1f16d0c6e26b186f7649e53feeb6e3
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-2.0.0.ebuild b/dev-python/urllib3/urllib3-2.0.0.ebuild
deleted file mode 100644
index 8ee137c6da4f..000000000000
--- a/dev-python/urllib3/urllib3-2.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.1.ebuild b/dev-python/urllib3/urllib3-2.0.1.ebuild
deleted file mode 100644
index 8ee137c6da4f..000000000000
--- a/dev-python/urllib3/urllib3-2.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.2.ebuild b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
index 3d07423a2d37..9c46c938c35a 100644
--- a/dev-python/urllib3/urllib3-2.0.2.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
@@ -28,7 +28,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
 	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
 	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index b016f986830b..1fb435716146 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,5 @@
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
 DIST xcffib-1.3.0.tar.gz 89874 BLAKE2B 5dd8d64b906d92cb987ee4398da668d6034faf4abc24a56c0fca3e5b6d0cd1252ea1459736a9f7fb83ee97d4d6cec5d103eb19aba626a3d646f67e6332e255a5 SHA512 a493f86891158ffa0c36168da5e7ebdeadafe5e9f067e2ad6052cf302c89db612f907b5e9950748fcfd74886b808870986529902bae77fede7e27d5d422d6ec6
 EBUILD xcffib-1.2.0.ebuild 805 BLAKE2B 273fcacfa407eaeddb2a1e05cd46580766fc03307a8224b5cee35f38131aa6d025bbc98dba2cc7c6545284f79b1115e4d40534764629b2ea90e69a1a0b206f2a SHA512 38aa6f5b01ffff693d5bcad5a199ad4eebfbed9508e9038618aa1651365dd9402d49cadae0983315b99947ed5052862067bcc825b873761fd6bcfffd75062de1
-EBUILD xcffib-1.3.0.ebuild 812 BLAKE2B 13ebcf5c25c688088b9b7223826b6738f6762524604695489e583118ea832373c3b340e5ac9888f85e0d546e28b35f7800e12237054a00953cdd3fa62ce939a2 SHA512 9a14a4bb091e24a6a4c8e0bd4d5fabb57d749cae3eb46d47f912d1f971cace347d201f2e77d8857244eff4887a895e5b1c1d77e40310c04263b3d4584713e3e6
+EBUILD xcffib-1.3.0-r1.ebuild 778 BLAKE2B efae7c97b1ec25fef9e5ac7b14d92dd5889e1ee03de3b12ed47c25d73504e534fc23d92b7b90d20f947719ba6cc843f6297c54d2d71a1fdc7b5d6331a1456df9 SHA512 d64f358fcf27c5e57f11db239561e4195ac4f298a60b3d70f02085b384efca0b44730d66a8c1d754b2973cc14c7e88aedc2075a3e808cdc762198bd9978708d1
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.3.0.ebuild b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
index 0d811a0a3f89..827dd135f36b 100644
--- a/dev-python/xcffib/xcffib-1.3.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
 	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
 	${DEPEND}
 "
 BDEPEND="