gentoo resync : 23.09.2020

4 files changed, 68 insertions, 41 deletions

diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index d472c4ffd356..0c4b3075de93 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,5 +1,7 @@
-DIST aiohttp-socks-0.2.2.tar.gz 1351798 BLAKE2B 40c9e033de523cad365e95051d48dee5fbd3d964e7b3864393c54d23394a5cfcfcb46cb9d78f25a6101bc97034c77c5a75aef94cfb962054c29bd804e387b0a9 SHA512 218c262cb3eab74166686614ab5a720c31d1ce886cfd655f296c930f648b1d94e909724346769a46b600b8f1bc8ddbc498ee75cd5854e409566a8ead6a7efdab
 DIST aiohttp-socks-0.5.3.tar.gz 1360418 BLAKE2B 7282a4952d5f0301b14291a1892db5ec058af91cf553e4a17ab0e933bb327d1fae9c015d25ff7405ef69cdf56637140fefa9bd1ab1e6f2e224cdc94b9e279159 SHA512 2999f850081d05c31535c24c0fcf0948dbaaec5e421c28ed4ca68b4bfb122f881942e7e829cefc01377212b4579547aafcf273fe5a999acb3d158ee1c3f0a888
-EBUILD aiohttp-socks-0.2.2.ebuild 910 BLAKE2B 54c6dbbe842bea798ec60d15e6cf1621db8a389237b70234d0b1932207729f5f8864bb83ac9880295e144a5711191bd33658f321199ab6f7f5df063cb6afb78d SHA512 c8b121e6f22b6d0a8ef15c616483ab90afc6142e59cf74982b1942fc17331cfe502fa43cb786cd82161857ab392fe928f5c92b8533404c32ea71c3628a8dea10
+DIST aiohttp-socks-0.5.4.tar.gz 1349276 BLAKE2B 17cfc9a326d45e6af4044ccd0ce56dff3adaddf619118a5a98a6e82c778f5e397780d51924e11ff50d059a60df22cbb1c03b27165042f78d06b242ed95f5f254 SHA512 30ac5544b935f021fbd40aac9df682970a1ed39295dcd64909dce270e66f61fd92933a81a25c79b5063a5b382d412ba7b26def67e1e8c059e8daa2a771342a77
+DIST aiohttp-socks-0.5.5.tar.gz 1349283 BLAKE2B 85cd19fdc8c549a1c8ed66a71a9ccb61093fa6febfc2b2e93e26e47be9fc4d319f0ceecc0d6f70739e861fe5f7cd8c78615dfe67ed0669049d38da1f89da33f2 SHA512 94b9d5fc5a5eb04ce16302ca4a1abdaf8ec2b31811a6156aa3667aeb5bd284fc1757a65dc8dc7b77450017a04aa315a908a52a4d38b0657c41bcd64b9b1605b9
 EBUILD aiohttp-socks-0.5.3.ebuild 1058 BLAKE2B 3461bd234b16dfbe7073c74e4350fa7babb891ffc6525f1d3c4caa8d3f1d2aa8a674e6ce1773059c977019da5383e5bc91f5979d732b590820b57dc6434b24ac SHA512 0524811144231792ff10e2f6f74e6b9a3d1f1fe9b50551baeba838525394684ea3df47d82f4d400ccf134521a1646e2ce4e4e4326d72fa4f13acb98f91686abb
+EBUILD aiohttp-socks-0.5.4.ebuild 765 BLAKE2B 128edf96e1f0692d59295b9124c65a9a2a621c4608066da2f88fa3447599d8bcab8f60b5108e10d5fa237227402fde58d1555ad76f80a3ca81711c1992969b44 SHA512 aa95ff16488ebe21f465611002255ffdc691aa861b6f4dd88fc660e4a2de5b5f7da03de97514a080ceec508ede506cc2911d4dfb9131bc985b3ffebfb69ee723
+EBUILD aiohttp-socks-0.5.5.ebuild 765 BLAKE2B 128edf96e1f0692d59295b9124c65a9a2a621c4608066da2f88fa3447599d8bcab8f60b5108e10d5fa237227402fde58d1555ad76f80a3ca81711c1992969b44 SHA512 aa95ff16488ebe21f465611002255ffdc691aa861b6f4dd88fc660e4a2de5b5f7da03de97514a080ceec508ede506cc2911d4dfb9131bc985b3ffebfb69ee723
 MISC metadata.xml 416 BLAKE2B fd462ceb91bb4032d944cfe0a6f040120e2492a2aab5a34e6d6416ee9dceb51df7fe3b12cf125415989ac7c2be72d609a1955ebc825cb8e9eaa16dc28df89532 SHA512 6712e24058ed1a73dc03eaca9537df0f6ddaace9a5391cfb01453a342bd8ee5d81ba602e582490bf647bce3665567c6cdadcf4d2b92730f77f79654a309fcc20
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
deleted file mode 100644
index 9b27fc1c0416..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
-SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-# Tests require Internet access
-RESTRICT="test"
-
-RDEPEND=">=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		net-proxy/3proxy
-	)"
-
-python_configure_all() {
-	rm tests/3proxy/bin/*/* || die
-	if use test; then
-		ln -s "$(type -P 3proxy)" tests/3proxy/bin/linux/ || die
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.4.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.4.ebuild
new file mode 100644
index 000000000000..083f5275a69d
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.5.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS proxy connector for aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
+SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests require Internet
+RESTRICT="test"
+
+# TODO: optional dep on trio
+# TODO: is attrs actually used?
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/python-socks[${PYTHON_USEDEP}]
+"
+#DEPEND="
+#	test? (
+#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+#	)"
+
+#distutils_enable_tests pytest
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild
new file mode 100644
index 000000000000..083f5275a69d
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS proxy connector for aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
+SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests require Internet
+RESTRICT="test"
+
+# TODO: optional dep on trio
+# TODO: is attrs actually used?
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/python-socks[${PYTHON_USEDEP}]
+"
+#DEPEND="
+#	test? (
+#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+#	)"
+
+#distutils_enable_tests pytest