From a984494e5a73cca4db8adb6b670fbd04c3af955f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 29 Jul 2023 22:40:34 +0100
Subject: gentoo auto-resync : 29:07:2023 - 22:40:34

---
 dev-db/Manifest.gz                  | Bin 15567 -> 15572 bytes
 dev-db/mycli/Manifest               |   2 +-
 dev-db/mycli/mycli-1.26.1-r1.ebuild |  74 --------------------------------
 dev-db/mycli/mycli-1.26.1-r2.ebuild |  82 ++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 75 deletions(-)
 delete mode 100644 dev-db/mycli/mycli-1.26.1-r1.ebuild
 create mode 100644 dev-db/mycli/mycli-1.26.1-r2.ebuild

(limited to 'dev-db')

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 86499e6f711f..f7afc642a8e9 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 347333ed0c0b..4fd64e487f5d 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,4 +1,4 @@
 AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
 DIST mycli-1.26.1.gh.tar.gz 279221 BLAKE2B 2bb178110b5aba3e381541a7892cc1d8bed8e41c499d1dc36fa39435805a118536de44bf21b2ca2652afefcd15f8bc86ed77de876f703740e796444ff8cea6b0 SHA512 bce9def37718444f2445ed3a7ad91c54df4cc3dc5d207a4a2e0fc72eb27b75fca687958241fc40f5494efcdf9e4bae251f3cf94c13b967dd922d5ff653348c77
-EBUILD mycli-1.26.1-r1.ebuild 2050 BLAKE2B 402b90263dacf222b8a769245c94ef35ac9bb54c1a75667281abb582e4204cb778f2eec016778faf4ded29ce63027cf2d6a4235b28c708e84c2f488237521429 SHA512 c296de49a78fa7b5f7dcd8ce0bc05f1ac8c0d9318ea0a64b194d77c0d74b229075ed09bef923efc705433e3149203ab334e45f9381e0f441ab4631baa498da99
+EBUILD mycli-1.26.1-r2.ebuild 2250 BLAKE2B 6b4dec3bd42c44e9e851004e05f56bd63afd8f8cfdc8954208f34519ad908f0dcfcb5be35f99ae797162349f75f4b71c25d9e171f690ce61809effcf2158d0f7 SHA512 cec1706da14a81721ada30ce22ca0ba1e00fba12f8cdb027be97bb785e83c8abcf102e91b953ca6e94b63f86842232052f8fb6fb87a1db7656a1572d679607b4
 MISC metadata.xml 626 BLAKE2B 754538c528392717c6f22b1988d8d901458eaa053d90fdcc6a96c30408a6f9e661bbd8da4dfd57e8edc71e715028e493d7c3b3994ae7b337556881294c771095 SHA512 1d08dd18cdc6e1ab95e80b5234ed6f64c6b9f69346c86bde183c8bbee1940fd54c6a958b03e9b142dceb6d7e61eae2d47c3c5012a9e368a4ec6617c7539729d5
diff --git a/dev-db/mycli/mycli-1.26.1-r1.ebuild b/dev-db/mycli/mycli-1.26.1-r1.ebuild
deleted file mode 100644
index 1f0f11d9838d..000000000000
--- a/dev-db/mycli/mycli-1.26.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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_{10..11} )
-
-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.5[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}]
-		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyaes-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlglot-5.1.3[${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/paramiko[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Fails after a seemingly benign change in sqlparse 0.4.3
-	# https://github.com/dbcli/mycli/issues/1103
-	"test/test_smart_completion_public_schema_only.py::test_auto_escaped_col_names"
-	# Requires a running mysql daemon
-	"test/test_main.py::test_batch"
-	"test/test_main.py::test_execute"
-	"test/test_main.py::test_init"
-	"test/test_special_iocommands.py::test_favorite_query"
-	"test/test_special_iocommands.py::test_watch"
-	"test/test_tabular_output.py::test_sql_output"
-)
-
-EPYTEST_IGNORE=(
-	# Requires a running mysql daemon
-	"test/test_sqlexecute.py"
-)
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
diff --git a/dev-db/mycli/mycli-1.26.1-r2.ebuild b/dev-db/mycli/mycli-1.26.1-r2.ebuild
new file mode 100644
index 000000000000..b58c09658700
--- /dev/null
+++ b/dev-db/mycli/mycli-1.26.1-r2.ebuild
@@ -0,0 +1,82 @@
+# 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_{10..11} )
+
+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.5[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.6[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyaes-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pyperclip-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/sqlglot-5.1.3[${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/paramiko[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Fails after a seemingly benign change in sqlparse 0.4.3
+	# https://github.com/dbcli/mycli/issues/1103
+	"test/test_smart_completion_public_schema_only.py::test_auto_escaped_col_names"
+	# Requires a running mysql daemon
+	"test/test_main.py::test_batch"
+	"test/test_main.py::test_execute"
+	"test/test_main.py::test_init"
+	"test/test_special_iocommands.py::test_favorite_query"
+	"test/test_special_iocommands.py::test_watch"
+	"test/test_tabular_output.py::test_sql_output"
+)
+
+EPYTEST_IGNORE=(
+	# Requires a running mysql daemon
+	"test/test_sqlexecute.py"
+)
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
+
+src_prepare() {
+	default
+
+	# Remove unnecessary pin, we have paramiko 3.2.0.
+	# https://github.com/dbcli/mycli/commit/eaddc5ca3e208d66fd4f400b90eb76089dd35e4c
+	sed -i -e 's:==:>=:' setup.py || die
+}
-- 
cgit v1.2.3