gentoo resync : 22.12.2021

5 files changed, 129 insertions, 4 deletions

diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 58a1e149ea8a..ccee34f47c58 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.26.tar.gz 7836259 BLAKE2B 149c9947f5536a3715bb05f5bf72a58b597873f824aa492af0df1a0bcbb0e5d8ff848d171f9d12a9f3acc872d3b05df6e67ed79dc190e82d376df152ad150383 SHA512 0289bfc61391e330a8b3df0876727947c6ebd55b54922d3c6107e47a1da27fd6bf7087edbf259e1ef8e7359f53c73d833185f0bc72d307defdb56560bbb21902
 DIST SQLAlchemy-1.4.27.tar.gz 7907686 BLAKE2B a9751a82e81bcdcf1bd344f0275c0ff89df38c7e9eda4470d147f4b50b0a2a0d7e9861d932fb6382328ec0e2024d72279ea889e4dadd61a4a33fc3e085521604 SHA512 8d1d76596b1698e320305a07e3f0a56607568ef60b6be36c86c0cabc843c8d6d62034d7446eef69f0cd0687de474d34ce1161c1adb9fdeea8c0b47af372015be
+DIST SQLAlchemy-1.4.28.tar.gz 7968048 BLAKE2B 1e08eefd5a6abbff5c7f7a09a67eb144e6e863b94c33224808507aa1c4392b0895ab4bd02a091c1b439fca1e0312d1f6c29c605fe5c8699438c9694603502b67 SHA512 26f88df36fd91aea40c1f5e233a3da962d2d28b47f9b3157f537ea1f6bc4dac43f7037025b55511eaaa377ffb05f5c5bd1e1c69596b58c1f193e98f437c0c831
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.26-r1.ebuild 1249 BLAKE2B 706ba01625b89f675bbf51d8f5361d9f516831f35b2265bb4c73f20e42102ae537261ea9f6224fcad679faf760c550d4ee5a5cc4ce0e78d5bb7d81cd756651c1 SHA512 59f36d922f00a51f707b6e80a54f11f102ce20e41746ff430b33bcfcbfe78403a4f70451bb40a71917d5c02f845287d0f0a9fb6be09c08358917b4a73215194f
-EBUILD sqlalchemy-1.4.27-r2.ebuild 1324 BLAKE2B c6c33bc65a96880aa4aad680fd3c526d0169b5f970bbd5bc7e66e86b78dfde17a60058f5766f49116c42caf53db0e8772a823fc1dc35d23911ecca3697dcb55d SHA512 183a07a6e734f07f00a9e46ee0f5479fc7bc83bfa813263af02fd3d8bbd0b67b5dae802a692f8a5e2713f1fa8b0ec14b26a1b64f631e47c148e60f43ead07f90
+EBUILD sqlalchemy-1.4.27-r3.ebuild 1473 BLAKE2B 36385a89ec8072f003aacfd4a531b8f143027ff84fb8445fbaa85eac7763281cd3d65c42fc32110bce3b364e68b4e9248dfb8d14e69765866edc628619dd15d6 SHA512 3ccd06e1e9a74deb7ff6c6b7b52bdccd9bdb520bd30ff3765ed05f6963095afd24bca5f569b7f1cfd9e1d01832a4298d007a92e684eb9ff049fd6f0ad36bfe24
 EBUILD sqlalchemy-1.4.27.ebuild 1257 BLAKE2B 2acc083acaf78a5811a2d602e9e6ae4f19f8feea99fb882d0e79675d29d2e514d79eef0283d6b9968941bbffa73a514c125ad86ae2ffac7c2367a748f5176a37 SHA512 13cfbd30ab3478af1d5558182381d0185b29929f6e7c281e38bc0d317583afe780ef42841bba06c150b001b394f5bc567bf424c8ffee03242b1d4fac2bf0540b
-MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
+EBUILD sqlalchemy-1.4.28.ebuild 1476 BLAKE2B 0144e5780f13a789466925812d2af43a82864248e5e429fbcf37402e27d3ceba11dd96252a3ef2768e519520799eef1c78ae89af783904cd2b654c891755fb84 SHA512 e19afc6a5a0bbbfa3a25dc4a3c535b34ec7304f4ea19f38e056e4cb8fb27066db480b09831f7cc28de2848d24368eb573cd61d79229db16f9872abf28afd5254
+MISC metadata.xml 559 BLAKE2B ea16915a919a696aeb113a3c13077053765cda94a3bd661734713f9ddec74220bd58d0646cba810c7571a738d3c3f5716634e1d83b3225c0b44fc837eaae1990 SHA512 21507feb9afa0e2dff2fad85e61c1245faa9d1ac0140074bec1cfb58b0895e07365ff65e1be9059a37fa1706365ed5d1e0fd6153bf95ab7648b0e45fd11de97c
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
new file mode 100644
index 000000000000..07184b843c9e
--- /dev/null
+++ b/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch
@@ -0,0 +1,49 @@
+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/metadata.xml b/dev-python/sqlalchemy/metadata.xml
index 6558375c7fdf..945c32d07fef 100644
--- a/dev-python/sqlalchemy/metadata.xml
+++ b/dev-python/sqlalchemy/metadata.xml
@@ -10,4 +10,7 @@
 		<remote-id type="github">sqlalchemy/sqlalchemy</remote-id>
 		<bugs-to>https://github.com/sqlalchemy/sqlalchemy/issues</bugs-to>
 	</upstream>
+	<use>
+		<flag name="asyncio">Depend on <pkg>virtual/python-greenlet</pkg> for asyncio capabilities</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
new file mode 100644
index 000000000000..8d018bb5745a
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="asyncio examples +sqlite test"
+
+# greenlet for bug #823794
+RDEPEND="asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )"
+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() {
+	if ! use asyncio ; then
+		eapply "${FILESDIR}"/${PN}-1.4.27-drop-greenlet.patch
+	fi
+
+	distutils-r1_src_prepare
+}
+
+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 "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.27-r2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
index 24bcfe77ce84..ae9f2f013d72 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
@@ -21,8 +21,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
-# greenlet for bug #823794
-RDEPEND="virtual/python-greenlet[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
@@ -31,11 +29,21 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+	# TODO
+	test/sql/test_compare.py::CompareAndCopyTest::test_all_present
+)
+
 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_install_all() {
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
@@ -46,6 +54,7 @@ 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