gentoo resync : 15.06.2021

3 files changed, 70 insertions, 2 deletions

diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e34992035d45..ed366afc5769 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -7,12 +7,14 @@ DIST SQLAlchemy-1.4.14.tar.gz 7599698 BLAKE2B 500a6257829244e1181b8ef5cb39fb87b6
 DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
 DIST SQLAlchemy-1.4.16.tar.gz 7629704 BLAKE2B 46626cb38e3ec2c5b5c203a03da1a613cb5b66f2906edc54c03843b87ce8f12fbacb6fcd8b2b36584c53516de24b8c1bae041489a376472e4d2e6e2a301b707b SHA512 035c740b49356b1226ed79f188d022904d93190e5391edd350e44e63301333efcfc6c47477ce5119fdbebd49aa3e21b2764d3e4dcc6be5948428f1d8cf11c84c
 DIST SQLAlchemy-1.4.17.tar.gz 7630929 BLAKE2B 88b75c930caf674aa6d927336573f0e40fc89ae72735c11479eaa15de56754807b5412409d383857104a3027fcae346e747cc605525fe88c0a0f9d4ff39fcc7a SHA512 ff99a3a9c440fcdc10f6f43905672f72929fff430b3d9583b8e81693ff9d54ad5d9607b8041787074072cdf1ba03b31db9255cca1c50c8a43f275a0905e9f0bd
+DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.11.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.12.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.13.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.14.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
-EBUILD sqlalchemy-1.4.15.ebuild 1701 BLAKE2B 165da9ccbcfd53b3da315b2bbbc3c26dcc5db91fe35fa1d460f570176cba17dd9c5706372e745c805c2d4a2d03739bcc4c8a2019dbabef9ae6920adcedbe3c87 SHA512 4b9642194c976dd2d2bc74d2ffbc81a980d9f661a0e571c53c110e91c41c3208a8c04013aad16b66e5c043a143a6f98a0057cd54361a79f5e9098c0753fd61ba
+EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
 EBUILD sqlalchemy-1.4.16.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
 EBUILD sqlalchemy-1.4.17.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
+EBUILD sqlalchemy-1.4.18.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
index ece650fd161d..34d7b91a49dd 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
new file mode 100644
index 000000000000..144d57d9ca1b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
@@ -0,0 +1,66 @@
+# 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+# 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() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-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
+}