gentoo resync : 15.09.2018

5 files changed, 61 insertions, 66 deletions

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 17c6a9b96b98..02e1e6c23e44 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,9 +1,7 @@
 AUX remove-tasks.patch 423 BLAKE2B d4259bb4d0ba1434fb88d25ae1f2bc4e81e89d81c9c2d45f1ac442b2de14d5b9e42ac7ad25a73c18a80570d20626db1c8070965f817f185d9de42bd9ff1605e7 SHA512 21e577769418867ce6a3ea71e8b8949c8974a2a0f1750a87df6f125e53dca04e5e93381324b1d6f9f99b7795bb2e13384619ea4664c3d2c77c5ec83ecd4e33c4
-DIST mycli-1.10.0.tar.gz 272722 BLAKE2B f2a4d7b76684718167fb6bb4f90a96a31b669cf1f35c266ed544d00b4fe4f9b0cb2c6d81e161d41f1df785e2dcf79056a675857f8400d8cd7811199ea00064b7 SHA512 d66866fd23ee2be3f1bb47d1414b8151c2b50e8844a2553e139f753ae55dd010d1c23aae7c5863891ea4f347b124145405dc7894efc27fc8fcb74127c14261f8
 DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559 SHA512 7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
-DIST mycli-1.7.1.tar.gz 266597 BLAKE2B 8fc6006dbb85a7053d67040d492ba12619507160efd240fdb89125794a01fbb439756bdeb420c306a883db925f6ec7ae0c36657c4c4b2197cfb702fc77babcb1 SHA512 5c61fe67f3205dd1123ed8d38441cda0574db04dd46b7e075d216f7aa8cd856a2f06a1b4bf7dbe9fd0b07f3e91c151fe3f885d10d3db488b6c306e0ce9ac9e7c
-EBUILD mycli-1.10.0.ebuild 826 BLAKE2B 9180f33ae816809a14aeff8f2fa431d72c956af912a82ba0ed36a209fc6ccd9918f564ce948569fb70ac07cd26f8f3c152ee740da80a0f590bcec3eff1f2d78d SHA512 7ee091496ce1c8232cdcd341df556f1913ff70eeb872f71fdf83be842c5dcd04dd68752aa271bccd34473e747b802b13a3fe8dcff175d64362668c0ad2de6d4b
+DIST mycli-1.17.0.tar.gz 276786 BLAKE2B 203c54b58a7876fd0bab5a05880621263e5cdf786b13207f04dfaf38866f5a7250e8fe8e1c5870aa9d3f562cf9963f15cc433e3ddd2232531f4c823e46778ac7 SHA512 bd64f44ed7b16a1e9c684da52fa60436876b26333e2705e5226c4fab3a979c6680314447333d01e4fdb274d33a7f093cbb2f732e5b4e04c5330066f9918a35ba
 EBUILD mycli-1.15.0-r2.ebuild 1002 BLAKE2B c8c7c5e457d86a1629face8f1e52eebf2339a140bac876740d68187420284785e15c5beacda85ac78306ce75ee37d37911e0b9f8322f99488ec4d1fadff39a89 SHA512 95d43f7dffbf9c22929a6437aa0e356888ca2b765ff836bef2bda8fc10f30226ab65933c0d917b9d5836d2e2dcc6a9e594f4d17818107347e945750b16da3bcf
-EBUILD mycli-1.7.1.ebuild 944 BLAKE2B 3bdc0bea132ab0d2bf92dc8c0839a12503a98a6f6569c62e5a9bdab2a671385808a74824a0d25872fd5e6d76de64e511a9e5dceef811462d17b680d9fe3589be SHA512 ff09a53cdbb658f2d8582420a4575429e994f0091b08c0665490544e78f0001256561b050af346994c8d4dc380ac6bd168c7323348fd8359be6cf3f42a0f815f
-EBUILD mycli-9999.ebuild 886 BLAKE2B e5f76d34d1e2f0ac2d07996ec65b206426514f785aa4fb0a4df36462988cf5e3e0caf54d4ff68cba6cac46dcf2c0f390f345df1ecb0b29b4e8c42ae8de97bf33 SHA512 10fa18abca114309e15da7cbea85eab8af522dd6a0539042a89fc29ebac6ca3f9ec87d7059440bb984251e284e5764a0f7bbdce83e2d3c5c6024aa623a1b7e7d
+EBUILD mycli-1.17.0.ebuild 1252 BLAKE2B 77cba597742341658b826ba09e60a6ea6547a102d318a984a7ee63be155b4d4c801a89a520458c72616b85f57681300c0772c3ea2f38dddf5f4f7184ce0b84cf SHA512 acb8fa430589f2cca03a1d66acc9b22f7a649f6d2f044e6e025c9e1a6a2acb6cec405d7ad8aadbed277bb43495e593913171c6e19d630f21637e86913b75a386
+EBUILD mycli-9999.ebuild 1232 BLAKE2B fcd8637fc63e92a07c32a7fc105d7a25f12dc18dbf43e11f4c5ce4117aa6575699ac0555ae199e3ae13ee4e134ac307a7dfd3f817801df6a2ed3f4de9fd5177c SHA512 5d169fbfcac5c3d8d2760f5060d0085bc84e1a21245bad856641a7e417934c8257b39b4bbdc7dff419e91c6e7978359966303ddc22eb28eff7094bce9da74211
 MISC metadata.xml 322 BLAKE2B 16f308194537f996ff6a54d92c996267e2ea37d78d9377d3d3b5a6246ebf511c9dae536f03627a32885753a2d3943554a9748513a036ef6e10b952e5281ecfbe SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1
diff --git a/dev-db/mycli/mycli-1.10.0.ebuild b/dev-db/mycli/mycli-1.10.0.ebuild
deleted file mode 100644
index 5dd501996868..000000000000
--- a/dev-db/mycli/mycli-1.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-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=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
diff --git a/dev-db/mycli/mycli-1.17.0.ebuild b/dev-db/mycli/mycli-1.17.0.ebuild
new file mode 100644
index 000000000000..da3bb44df49e
--- /dev/null
+++ b/dev-db/mycli/mycli-1.17.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+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="test"
+RDEPEND="
+	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
+	!>=dev-python/prompt_toolkit-1.1.0
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	!>=dev-python/python-sqlparse-0.3.0
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )"
+
+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-1.7.1.ebuild b/dev-db/mycli/mycli-1.7.1.ebuild
deleted file mode 100644
index 687e4e87a094..000000000000
--- a/dev-db/mycli/mycli-1.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-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=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py"
-	distutils-r1_src_prepare
-}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index f3aa95b7cd28..73af45a0b5c4 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
@@ -14,16 +14,29 @@ SRC_URI=""
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+IUSE="test"
 RDEPEND="
+	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
 	!>=dev-python/prompt_toolkit-1.1.0
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
 	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
 	!>=dev-python/python-sqlparse-0.3.0
 "
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )"
+
+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
+}