5 files changed, 16 insertions, 90 deletions
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index f22aac8bbf3f..18f2a1baa603 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,2 +1 @@
-DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262
 DIST pgcli-3.1.0.tar.gz 441939 BLAKE2B 2c9c9a3afb233eee6f88d304e26e482760f1ff2a458103a80ffb80d877f63bd3ec74ba4be06238e8d78adf36ec251cd27849e0899f3b257b75ac9585f3c04572 SHA512 458871bf7ea0a83a66f44ecbde88590ca2aa08420a58c97d2716d4e36c61738d92283d007fc3968063daa01c25b2c46360292ad6339757c119ff04891e1a1c46
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..e9d55df76f5b 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">dbcli/pgcli</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>jakov.smolic@sartura.hr</email>
+  <name>Jakov Smolic</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dbcli/pgcli</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
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 9a187cbe87e7..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_{6,7,8,9,10} )
-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 b690eaed8d7f..fe6bf01cf275 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}]