gentoo resync : 25.08.2020

4 files changed, 85 insertions, 14 deletions

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index a0aef261a3a5..40c01344cd89 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,4 +1,7 @@
+AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
 DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d
+DIST mycli-1.21.1.tar.gz 267646 BLAKE2B e0678974949ae219236b89fbe9ebdacfee9c1efc8f92853c937150dbb841680664432e9f5c79181545df8b3321480cf784e45a83139351cc93256d26dcdd66f0 SHA512 beb3888ff8abc2a79e591516d7f0f76d0c18f186bd0dca3b4aadcf93b3045de53ac7f135553ad509273c85ea364e81df5dcadf9eacf1dbef8ceff7345aa5ed6d
 EBUILD mycli-1.20.1.ebuild 1285 BLAKE2B fea26ada4e62c0d97237d8e28076d7ce4ccd818e6e3c38b32c6f4b36c35b0e4bebda5d53972120306a6f14d8d30aec13f4ecc4967b2871a154014a7621a2e034 SHA512 a85982ab2b7751ed4e2fe180920fb3edf8118cbabe37b255e689b6e40c9350d5674109c4d6dc4447b7e7cc295fc8c2e51e05d336464fcb3b8b48801964837b11
-EBUILD mycli-9999.ebuild 1265 BLAKE2B 697f31b84b19e2630147a5e354bf183e720d86d56ea8bd108c57b165f287003575d9433d2ec02aaef454eb04df8721589277d3ac8b277154f982bbbc6ef0d921 SHA512 9dd324eb4e345fe079a81b6a2720e1ad5a6048448d2fdb9b2561946b6ef48835a7a98650bd82f2dbc925181631e5d03db6dfefea0a273037b953c4b0fe37060c
+EBUILD mycli-1.21.1-r1.ebuild 1579 BLAKE2B 374463b3c1671a25868ef4cf0e58496e0c15912088b225518eb8d36cb009b12245dcab81e7c9e92a6fd1a924eee6e979a4999f3169ec73aeb918d64a393e732a SHA512 e1ed0950ee2bd525623c59e8a4b2e7abc96baec3ce0bf400ee8dd26075da2b622ba6f628ecbc4e649abbe54af588477312feba6b2beed7521ca8c37feee2fb2b
+EBUILD mycli-9999.ebuild 1560 BLAKE2B 624da8139f363002c3ffd6f045a349cec30a7e3d8917bf4b2a482969eaf8b594da7996f7f164ac1883ce44819e67733fc9ac6e91e8f3a3c8a95a28caa879fcfc SHA512 84f246aba80728a62e11267ea415c00e898a3ac1041eaa8508f05672f029157cf459e2199a25ce104aa8cbbd16e1f36560046e3381f42a2e89f1166b15f3dfcd
 MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch b/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch
new file mode 100644
index 000000000000..7c802a803337
--- /dev/null
+++ b/dev-db/mycli/files/mycli-1.21.1-fix-test-install.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2020-04-19 16:15:15.000000000 -0400
++++ b/setup.py	2020-07-07 13:56:25.181039348 -0400
+@@ -85,7 +85,7 @@
+     author_email='mycli-dev@googlegroups.com',
+     version=version,
+     url='http://mycli.net',
+-    packages=find_packages(),
++    packages=find_packages(exclude=["*.test","*.test.*","test.*","test"]),
+     package_data={'mycli': ['myclirc', 'AUTHORS', 'SPONSORS']},
+     description=description,
+     long_description=description,
diff --git a/dev-db/mycli/mycli-1.21.1-r1.ebuild b/dev-db/mycli/mycli-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..042db5617483
--- /dev/null
+++ b/dev-db/mycli/mycli-1.21.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="https://www.mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssh test"
+RESTRICT="!test? ( test )"
+RDEPEND="$(python_gen_cond_dep '
+	>=dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/prompt_toolkit-2.0.6[${PYTHON_MULTI_USEDEP}]
+	<dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+	<dev-python/sqlparse-0.4.0[${PYTHON_MULTI_USEDEP}]
+	ssh? ( dev-python/paramiko[${PYTHON_MULTI_USEDEP}] )')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
+
+python_test() {
+	pytest --capture=sys \
+		--showlocals \
+		--doctest-modules \
+		--doctest-ignore-import-errors \
+		--ignore=setup.py \
+		--ignore=mycli/magic.py \
+		--ignore=mycli/packages/parseutils.py \
+		--ignore=test/features
+}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 829a69b455bf..9fcacbc962c2 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -4,6 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=rdepend
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
 inherit distutils-r1 git-r3
 
@@ -16,20 +18,26 @@ SLOT="0"
 KEYWORDS=""
 IUSE="ssh test"
 RESTRICT="!test? ( test )"
-RDEPEND="
-	>=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}]
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )
+RDEPEND="$(python_gen_cond_dep '
+	>=dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}]
+	<dev-python/prompt_toolkit-4.0.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}]
+	>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+	<dev-python/sqlparse-0.4.0[${PYTHON_MULTI_USEDEP}]
+	ssh? ( dev-python/paramiko[${PYTHON_MULTI_USEDEP}] )')
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )"
+
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
 
 python_test() {
 	pytest --capture=sys \