gentoo resync : 05.12.2021

6 files changed, 11 insertions, 251 deletions

diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5de437ce15bd..58a1e149ea8a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,16 +1,9 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
-DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
-DIST SQLAlchemy-1.4.23.tar.gz 7730769 BLAKE2B ad812a068beba3d55f629d4a3ee5eed6f61e46b19a7e1fcc717cfdd7a8d2cb759d894402a64550576b2cc28d82b53aa56ff4305d45433126a765909150a50450 SHA512 9e668b63487d0b9f9321a73bbf652aa82f31a90222429c4ba2f866edb0a313d8d10989febd456c87bdcde63ab595810232257fb011dce007538651426c1df0d1
-DIST SQLAlchemy-1.4.25.tar.gz 7776002 BLAKE2B 0c0330d07ab022925cdde0e94c4a33f699777239cc444f3ca31eeaf046b91b41dfe281861725af22a34d9641abb32b5e3558f684157bff9306c06b9333b89c99 SHA512 254d02f36df655638b204bbc8dbe6d32ce66e9f4a072cdb78dc7433b4d91b9cc88a3ec7a279ff2c818e0b794cc69debcb38310fa4734d9c295d067ed3dc33c22
 DIST SQLAlchemy-1.4.26.tar.gz 7836259 BLAKE2B 149c9947f5536a3715bb05f5bf72a58b597873f824aa492af0df1a0bcbb0e5d8ff848d171f9d12a9f3acc872d3b05df6e67ed79dc190e82d376df152ad150383 SHA512 0289bfc61391e330a8b3df0876727947c6ebd55b54922d3c6107e47a1da27fd6bf7087edbf259e1ef8e7359f53c73d833185f0bc72d307defdb56560bbb21902
 DIST SQLAlchemy-1.4.27.tar.gz 7907686 BLAKE2B a9751a82e81bcdcf1bd344f0275c0ff89df38c7e9eda4470d147f4b50b0a2a0d7e9861d932fb6382328ec0e2024d72279ea889e4dadd61a4a33fc3e085521604 SHA512 8d1d76596b1698e320305a07e3f0a56607568ef60b6be36c86c0cabc843c8d6d62034d7446eef69f0cd0687de474d34ce1161c1adb9fdeea8c0b47af372015be
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
-EBUILD sqlalchemy-1.4.20-r1.ebuild 3030 BLAKE2B 78d6ae1467a42e1c92ed2798fc03281a0dedeab15d4e57f908f835598ff3bb3fcba9b43139eaea85b5573069c7570c1cbef25eb603c50458665c93e3c476bbce SHA512 e7cf14c9ef808397b3c651846e8396547840723304366408ac012ae45ea8db726b0ddef0708fa81262284b212d04d351e6151e1f42a02f083723471bd344f13a
-EBUILD sqlalchemy-1.4.22-r1.ebuild 3038 BLAKE2B 96de9f1ec0b51979316f09c25aaac623e326f2f7d91aec9eb4ad58ee97c583ec3aca5ce45494e6384eb3377cc137ee4776380b7af9c168c10eb9f5d10bf4a39e SHA512 f25f18525e8c9b1bccd09f65205ab93f857b56b1de2cf12615dec7836081121663440dfd788d177cf316fd3bc7b3f99933495f1f41477328d02243e580a35871
-EBUILD sqlalchemy-1.4.23-r1.ebuild 1464 BLAKE2B 716051597209ab1ba07ce7a912eda584c742013847fa18e51d71329f65e573be8beace8ae7166481ee34519df1dbfdf1555a0fa8b6c5d2b61da3421a88bd3edf SHA512 35ca501c0bb90f382ef8f8f80bce6222fbf55e0acd508aca1a40becd9a99b1f9fde29304426348980f0cb603402c9511be3e1f4409c0e6f95c8f1d7cc6dbd341
-EBUILD sqlalchemy-1.4.25-r1.ebuild 1461 BLAKE2B 7056f278d1d8eb80154964aef76a75abda673a69ef027543a4f1324ac237a556a3ef78be54639ec8bcc622eae8e8642a2153478c7b67c384e0c5389ea7a7f45c SHA512 b0332542c1b550a04d3cca69459b33cbe0f95e0a865988e07550ca1e0a98c70539a15ee5fafc71966e3c7ae617025791f392a191f9d7fcbdf575038669929b43
-EBUILD sqlalchemy-1.4.26-r1.ebuild 1250 BLAKE2B 22006711f64f832b921c83849f8611cae30d2da8814da25a7c2ff66985080aab6df3c235fd30ef75e1ec3385b2e61248f19a41c0accc27df05ddc559e1d0339b SHA512 36c1a43cb705be2a84e3e90bcf4d4416a1c9d5baad3c97b4b45673a6a3a4503500ed37e11e2f3392a7650e71fcffa372945832ed17751411a276544c61a33db7
+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.ebuild 1257 BLAKE2B 2acc083acaf78a5811a2d602e9e6ae4f19f8feea99fb882d0e79675d29d2e514d79eef0283d6b9968941bbffa73a514c125ad86ae2ffac7c2367a748f5176a37 SHA512 13cfbd30ab3478af1d5558182381d0185b29929f6e7c281e38bc0d317583afe780ef42841bba06c150b001b394f5bc567bf424c8ffee03242b1d4fac2bf0540b
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild
deleted file mode 100644
index 62775f2cdaaf..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=()
-	if [[ ${EPYTHON} != pypy3 ]] &&
-			! has_version -b "dev-python/greenlet[${PYTHON_USEDEP}]"
-	then
-		# skip tests requiring greenlet
-		deselect+=(
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_lazy_init
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_async_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_no_greenlet
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_contextvars
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_ok
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_propagate_cancelled
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_require_await
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_sync_error
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_error_other_loop
-			test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]
-			test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]
-		)
-	fi
-
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.22-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild
deleted file mode 100644
index 40b28239f212..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.22-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=()
-	if [[ ${EPYTHON} != pypy3 ]] &&
-			! has_version -b "dev-python/greenlet[${PYTHON_USEDEP}]"
-	then
-		# skip tests requiring greenlet
-		deselect+=(
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_lazy_init
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_async_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_error
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_no_greenlet
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_contextvars
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_ok
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_propagate_cancelled
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_require_await
-			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_sync_error
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_error_other_loop
-			test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]
-			test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]
-		)
-	fi
-
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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.23-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild
deleted file mode 100644
index ea00fb36c7b1..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.23-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing 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 ~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
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling
-}
-
-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.26-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.26-r1.ebuild
index d275f810e7e8..30c6c4067ace 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.26-r1.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.26-r1.ebuild
@@ -18,7 +18,7 @@ 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"
+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="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild
index 2cf4410dacf2..24bcfe77ce84 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.25-r1.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( pypy3 python3_{8..10} )
 PYTHON_REQ_USE="sqlite?"
@@ -18,9 +18,11 @@ 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"
+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)
@@ -29,17 +31,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling
-}
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
 
 python_install_all() {
 	if use examples; then