gentoo resync : 03.03.2021

5 files changed, 4 insertions, 81 deletions

diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 3be271fb13a7..2c98269e44a8 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,6 +1,3 @@
-AUX pgcli-3.0.0-sqlparse.patch 1258 BLAKE2B bb899fcd3e059e3380d3bdba12765a1709af9cdb7f9da7358a436afc7229c8b33a2c83e27895321b6fe327ba2e81a35166a04649928d52215fc429df09d16b63 SHA512 c2e40269a65fe07140329c70d063e23dbf6853939005a35b209d1f32bb60786ece4fc37c760fc25ecf4859cde0cf7a4df158caaf6e40660a158bd102ecf15173
-DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262
 DIST pgcli-3.1.0.tar.gz 441939 BLAKE2B 2c9c9a3afb233eee6f88d304e26e482760f1ff2a458103a80ffb80d877f63bd3ec74ba4be06238e8d78adf36ec251cd27849e0899f3b257b75ac9585f3c04572 SHA512 458871bf7ea0a83a66f44ecbde88590ca2aa08420a58c97d2716d4e36c61738d92283d007fc3968063daa01c25b2c46360292ad6339757c119ff04891e1a1c46
-EBUILD pgcli-3.0.0-r1.ebuild 1066 BLAKE2B 05197c441fa462293e3a6014e1fa19cb133985c17391d2ec9254cd2bc0c75b73ad56695ac612e333d314fd9fad2bacc39d700357905d33ed35a7fe0ff3433e6a SHA512 066ad1309b1fe3894aa0aab927d619c955d733db6adebf20d5410a6cce1ef64e69c02f6e0cee401c5fe8e0809ec4839609a3150bb6cfc37e6fc94a0cea124d3e
-EBUILD pgcli-3.1.0.ebuild 1012 BLAKE2B 3863fc080b6e3ae625f7ce2f1c27d04a733b98a80fb6d8ee8e32a5fcd0c2878f173cb76bce64d5e5d030e852355d122e9cf6b43a9687636a23b7193bb133be2a SHA512 ff82755d52e5a9322ae5f6ce11597fd8914278312654cae6b70616955b635d115eafc75685210e512fa42da19d322e1b0ce6f22a4f15a1d2a188588025a08e1b
-MISC metadata.xml 460 BLAKE2B c6dc837776eb72ba61b0b0e00cd3f3adc022b70385204346eb2aa0eb8229636ab230be67b194993b22e18cda08b4f968ff02b96d390b8782aac2a4f4de92d7ee SHA512 a3b44f66861c5f8b66cda0fcac6b1d3418bf04835e7ed202ae22faca50ee22187fda785c6e7e7c0848f31b88e1cd9c8c6b4be1999eb600d48965edff2e959c35
+EBUILD pgcli-3.1.0.ebuild 1011 BLAKE2B 2eedf2e0abfff372a260ad99fb445480b71f4af68af07bbd364e734bde47c92148b0456558bf43658cd321da3b52490209d264ad390b8245263a0fd44f17ed1e SHA512 b644c1e97ca4e5fe88cd3a174aef4d60626f0e8502cf783e55a646ec040af27e3bfae10b70f92ea0ce2aff33f5dfa817aa09c0d80e15da934d5504c4e3b342b7
+MISC metadata.xml 485 BLAKE2B 635bd7fb0c4daa7b5cde8497c3a6112b320484daac2e27c87a69986f6e611db5723b97b7349c8c11ccf84c4ed4a2ec06e8a791e092d65eecdcd69248271828a9 SHA512 302332f48f73c36f9336b6bb53232a1acfb18c6a4ed3c4b90abb611592d43823c9c0c270fcd872866916f727eecfa85ea5228706d67bd41f16eb82a0f6dffae8
diff --git a/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch
deleted file mode 100644
index 4403a2e9c037..000000000000
--- a/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Taken from: https://github.com/dbcli/pgcli/pull/1224
-Author: Kevin Marsh <kevinmarsh3@gmail.com>
-
---- a/pgcli/packages/parseutils/ctes.py
-+++ b/pgcli/packages/parseutils/ctes.py
-@@ -16,7 +16,7 @@
- def isolate_query_ctes(full_text, text_before_cursor):
-     """Simplify a query by converting CTEs into table metadata objects"""
- 
--    if not full_text:
-+    if not full_text or not full_text.strip():
-         return full_text, text_before_cursor, tuple()
- 
-     ctes, remainder = extract_ctes(full_text)
---- a/setup.py
-+++ b/setup.py
-@@ -13,7 +13,7 @@
-     # see: https://github.com/dbcli/pgcli/pull/1197
-     "prompt_toolkit>=2.0.6,<4.0.0",
-     "psycopg2 >= 2.8",
--    "sqlparse >=0.3.0,<0.4",
-+    "sqlparse >=0.3.0,<0.5",
-     "configobj >= 5.0.6",
-     "pendulum>=2.1.0",
-     "cli_helpers[styles] >= 2.0.0",
---- a/tests/test_sqlcompletion.py
-+++ b/tests/test_sqlcompletion.py
-@@ -816,7 +816,7 @@ def test_create_db_with_template():
-     assert set(suggestions) == set((Database(),))
- 
- 
--@pytest.mark.parametrize("initial_text", ("", "    ", "\t \t"))
-+@pytest.mark.parametrize("initial_text", ("", "    ", "\t \t", "\n"))
- def test_specials_included_for_initial_completion(initial_text):
-     suggestions = suggest_type(initial_text, initial_text)
- 
-
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 5e8bd61f502f..22ae05489b8d 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">dbcli/pgcli</remote-id>
   </upstream>
diff --git a/dev-db/pgcli/pgcli-3.0.0-r1.ebuild b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild
deleted file mode 100644
index dfbd3a9b475f..000000000000
--- a/dev-db/pgcli/pgcli-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
-SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cli_helpers[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	dev-python/pgspecial[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-	dev-python/psycopg[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/sqlparse[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-db/postgresql
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-sqlparse.patch )
-
-distutils_enable_tests pytest
diff --git a/dev-db/pgcli/pgcli-3.1.0.ebuild b/dev-db/pgcli/pgcli-3.1.0.ebuild
index 9a7863d86f67..8813d3a0b170 100644
--- a/dev-db/pgcli/pgcli-3.1.0.ebuild
+++ b/dev-db/pgcli/pgcli-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]