gentoo auto-resync : 24:02:2023 - 09:47:15

4 files changed, 90 insertions, 11 deletions

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index be5267a95bb2..265aa13b0661 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,7 +1,9 @@
 AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
 DIST mycli-1.24.1.tar.gz 275983 BLAKE2B cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765 SHA512 5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
+DIST mycli-1.25.0.gh.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
 DIST mycli-1.25.0.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
 EBUILD mycli-1.24.1.ebuild 1618 BLAKE2B e0ec5443372ea120b6a74b7ccb2577d0131672a16c9200fc1d0a8bb1a6f35ccb31cc78af131253af7a72e31cf9b590d7d03bf7ed78525c22476e02463df3fe20 SHA512 0400144cd4e52b1270f0192950d795dd9b2624599e63e3e9d5f71ec81a71dadd6ea6bd04943d686064c60a897a635f5f447d6eadf024cbf5c14d6fe353fcadcf
+EBUILD mycli-1.25.0-r1.ebuild 1683 BLAKE2B 19ac87c1e08ec6b9a377fe057162779a57c284c21a430bf75fef6879c968791adc78bd4eb8917acd057d2554cc3e543f8a3baac802d8da00659cffc147027596 SHA512 8d89d44faf604e6fc8c7a6269567676d9fea28ae6503d9925ff7d7ecacfecea1f328a5346fd8c6d7f300988766d3a5ac12b59075503a124b742f6e04521d58a6
 EBUILD mycli-1.25.0.ebuild 1618 BLAKE2B 56f01bdac4cf29aaa6aa0802df6243b2b1393ea734fdc214379bc0addd00cb63f9c802bbf608de96bd0460dec69bebf5a2417eafb13e334ee332f53b1bf91380 SHA512 118160781e3a54bd61c5d48438fba97dfd14a84a98fdde450e9e4f14bb3bb56c952ac99cf397e724e75a7465abed892a59d53e51982847d2c84b010179f560b6
-EBUILD mycli-9999.ebuild 1521 BLAKE2B bdd19af8db8832bf1d17f77cc12333d1c67921d3794ce7c71ecadb700dc8801ba12a4dcbbb4dfe0e734a72e37ed701955e745863220cb75ba8864aa304bf14c8 SHA512 5b7a4671ac5a2f99d8490e9db076b947e8b1474ffe4abff45b4cb9670022d014f54b29f948fce67cc315997f1a899c8d4306271a14aff3db45521537ff534da6
-MISC metadata.xml 407 BLAKE2B dfa0f0bca1f39157b698c2109ed478e36ad966b7af46494cfba11481f9430c4ecd0738b231f66620618fe1ce7debf3e02108af4938aeb587c599493bc8faef60 SHA512 8ff03bb08d6a3d08216ba13e0b8c3d5aaba4ebc71eb6e77a66c154b68426f766124c8f4b5008a21a1a7a4c23587bc07ea91aec3edf98226dc9c8c3303ada0e54
+EBUILD mycli-9999.ebuild 1632 BLAKE2B 3cee2f7e2c0babc3b77c9a6af3fed8e270c6116f8c550884d06ec5895066adba93c9d386999c07543b7dcc888ee269808a5eed333125ccb1e8df33d9ded2bce1 SHA512 bf3986c2bbb4f5443f8f55fdbeb6c7b3ce3391e317ccfe1dd4bb90a16e45e1874321b7e1b20ac9ecd98ba2c4bc88948e59e4cd0a5460e41790841b36c8f3297f
+MISC metadata.xml 450 BLAKE2B 3e0375cce09c340d9fcff0ed562d6deadce1b36d46578a64e6a9ac0b6b280978ed0ce99ee5e70f04730b552d3f141842e67a561194399804296561e0a62eccb1 SHA512 bbf5dcbc28787f2ca1145117b9e6b5c7298b8db14697a67cb2abc0cef95d586cae7318afd8035516d021320c028402c99ded03832bdbaa7b41e92aaf43a28988
diff --git a/dev-db/mycli/metadata.xml b/dev-db/mycli/metadata.xml
index 861bfdab0b30..a84dc1414504 100644
--- a/dev-db/mycli/metadata.xml
+++ b/dev-db/mycli/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">dbcli/mycli</remote-id>
+		<remote-id type="pypi">mycli</remote-id>
 	</upstream>
 	<use>
 		<flag name="ssh">Add support for connection over SSH tunnel</flag>
diff --git a/dev-db/mycli/mycli-1.25.0-r1.ebuild b/dev-db/mycli/mycli-1.25.0-r1.ebuild
new file mode 100644
index 000000000000..7adb613b75a5
--- /dev/null
+++ b/dev-db/mycli/mycli-1.25.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+HOMEPAGE="
+	https://www.mycli.net/
+	https://github.com/dbcli/mycli/
+	https://pypi.org/project/mycli/
+"
+SRC_URI="
+	https://github.com/dbcli/mycli/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssh"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cli_helpers-2.2.1[${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-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		dev-python/pyperclip[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )'
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/paramiko[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		setup.py
+		mycli/magic.py
+		mycli/packages/parseutils.py
+		test/features
+		mycli/packages/paramiko_stub/__init__.py
+	)
+	epytest --capture=sys --doctest-modules --doctest-ignore-import-errors
+}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 878ff8604470..ede861eeb297 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -1,15 +1,21 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_SINGLE_IMPL=yes
-EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
 inherit distutils-r1 git-r3
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.mycli.net"
+HOMEPAGE="
+	https://www.mycli.net/
+	https://github.com/dbcli/mycli/
+	https://pypi.org/project/mycli/
+"
+EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
 
 LICENSE="BSD MIT"
 SLOT="0"
@@ -29,13 +35,16 @@ RDEPEND="
 		dev-python/pyperclip[${PYTHON_USEDEP}]
 		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
 		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )'
+	)
 "
 BDEPEND="
-	test? ( $(python_gen_cond_dep '
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-	') )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/paramiko[${PYTHON_USEDEP}]
+		')
+	)
 "
 
 distutils_enable_tests pytest