gentoo resync : 06.04.2022

4 files changed, 164 insertions, 50 deletions

diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 9ec1e8eda75e..cbc7fdeff834 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,9 +1,12 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
-AUX sqlalchemy-1.4.27-drop-greenlet.patch 1422 BLAKE2B 7ed9aae160a3b2d3a68c08f32d7a271f5c6ec1b2d93dd9afdb77b73655b1245feeb2982e8dfa9ae7ef0e5e55bd2e2ac7146c95e9eb605a067ee309df5115b28c SHA512 abcc4a546a879fcf7b491259cc520365ead64948fefc47847f6761501a463577a9787f024360d25c2061829e431866d309f5c28b4e2af592f9b4224f583229b7
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
 DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5e16fc54c3a9a42b18cc13906640e4710146325e870598f8905074bf6dad42ea524febc029b1dd5f063e978ebc9a442 SHA512 e54261fcf992845b2e6be47d23f530aec28c7517e6741b1b6a101b9888d3dc3162c1eeab0acc1edb33f56f1360bae3cdccdbcbff0e1e88e477c93d0cd910c17c
 DIST SQLAlchemy-1.4.32.tar.gz 8077546 BLAKE2B 8eb0b617cdc147da21722f3e9b7c9c0659c9bc02f0530c724a7c8afafa9ea018c0558b58baa0387d84627115d474e87996fe8c7768ac53d55a0c817bc8f167b7 SHA512 e9bc125cb531182c97c9588bc7b87028ec334efe63d81d0bee0e7f74b0ce88ac183236298a05cdac42f3a0241b543528bf6f225d199e4bf6d8199caca63581bd
+DIST SQLAlchemy-1.4.34.tar.gz 8133799 BLAKE2B ec8b14bf4df2d9188805bf49aac394d5944e234099bcb9f20cbbb4114c757bee5933d1fd7025e6eda01bf7be6603cae83ff751928783134031ddf1ccf5d36da7 SHA512 c3158dc2c52dd865d98b84ce4cf0adde38300504d5f5ff61f953927baf8f2264d53255f6e83e2ce2f720529f1e8b3e57e684d56a57fd6a0881bd4f1ba10b373f
+DIST SQLAlchemy-1.4.35.tar.gz 8136388 BLAKE2B 01a47eab8e11daef133a218a7ef13fa149fb4616b531c3c6d227cc26e3264c259f42770b72335a9fbda5e66ae1ce242fcbe676a528ca1af896d990a84a1f1a57 SHA512 195ab35934bca36e7c4c2127f153eff31775f7f150163912f79143efae63911eded67d8645e08ede2c533c675d18c3c5796235e0c0f6d1e6ebb97664ac13f171
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.31.ebuild 1904 BLAKE2B 0e84fa418b508f4793ceabbe655c227b3f2cd92bd626e5ecde35a9996182f24690db87cfaf5172eec8d0ec27e425824180fa1f5fddf4b68ed026d7c6ad95a373 SHA512 9dad795092985c87f6929f9e8f4184ec3ae99458e2bf2518da13769c059bb24b91782d8fb4d5b00e7eb5e477428cd1eb7c1dc2dfc03c521bc7576aafe52153a5
 EBUILD sqlalchemy-1.4.32.ebuild 1918 BLAKE2B bea31a01db2aced03a30892bda95b78b949a3f7cc3f447a9657b12b2c2c42680b8426bce9d2033b3e752d28c2ac23766c3ddd154ded311986bc0606114ac0533 SHA512 ec947ce600497e7dd9c46f1d318315a209a84c22bcc42d67949e1310eccbd8b706dfa93805123ea935d793e4299de61004c3693fd695af5c0dbc02f351d0d4c4
+EBUILD sqlalchemy-1.4.34.ebuild 2082 BLAKE2B 0afdbc46dc7e213d0d7d8a4ccd20f6610cd631a2ac6898db3b6c8e95701e09caa8871e4942033fd44fff23890c0be7a8a768517ea970f7c5fb080068cc239964 SHA512 cb939b3f14a15cd546b5cadfbae406607fa95be07436167586b424aee80fc382988daf07f77c60d09c55d0846825a3a30bed64b10bfcf520e1e09caeb0375f77
+EBUILD sqlalchemy-1.4.35.ebuild 2137 BLAKE2B d00bc47b9c2cdd92164ece6932d886b6dfadfb7a10df80dd6d4b827f2120d2dd188e61a234740a4c6597436904b3fb4a4b08e92c4b701d918c50991a3463c7ef SHA512 97a09f7f2c1442daec6490bd98d59d0eae4bcb12c7f4bf41b466ba92a0645c87b02586e1a21e40ab1ec6cbd210e63a5fe389b76d0534bfc0a490e6d1bd75bc13
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch b/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch
deleted file mode 100644
index 07184b843c9e..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Not available on all arches we support and is only needed for
-a few consumers.
-
-https://bugs.gentoo.org/828482
-
-From: Sam James <sam@gentoo.org>
-Date: Wed, 8 Dec 2021 00:31:01 +0000
-Subject: [PATCH] Drop greenlet dependency
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -36,11 +36,8 @@ package_dir =
- 	=lib
- install_requires = 
- 	importlib-metadata;python_version<"3.8"
--	greenlet != 0.4.17;python_version>='3' and (platform_machine=='aarch64' or (platform_machine=='ppc64le' or (platform_machine=='x86_64' or (platform_machine=='amd64' or (platform_machine=='AMD64' or (platform_machine=='win32' or platform_machine=='WIN32'))))))
- 
- [options.extras_require]
--asyncio = 
--	greenlet!=0.4.17;python_version>="3"
- mypy = 
- 	mypy >= 0.910;python_version>="3"
- 	sqlalchemy2-stubs
-diff --git a/setup.cfg b/setup.cfg
-index b7f69e9..91993f7 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -57,7 +57,6 @@ oracle =
- postgresql = psycopg2>=2.7
- postgresql_pg8000 = pg8000>=1.16.6
- postgresql_asyncpg = 
--	%(asyncio)s
- 	asyncpg;python_version>="3"
- postgresql_psycopg2binary = psycopg2-binary
- postgresql_psycopg2cffi = psycopg2cffi
-@@ -65,13 +64,10 @@ pymysql =
- 	pymysql;python_version>="3"
- 	pymysql<1;python_version<"3"
- aiomysql = 
--	%(asyncio)s
- 	aiomysql;python_version>="3"
- asyncmy = 
--	%(asyncio)s
- 	asyncmy>=0.2.3;python_version>="3"
- aiosqlite = 
--	%(asyncio)s
- 	aiosqlite;python_version>="3"
- 	typing_extensions!=3.10.0.1
- sqlcipher = 
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild
new file mode 100644
index 000000000000..1bb418de0bfe
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
new file mode 100644
index 000000000000..00bf1bc4a0bc
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}