From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 12 Mar 2021 21:55:15 +0000
Subject: gentoo resync : 12.03.2021

---
 dev-db/pgadmin4/Manifest                |   4 +-
 dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild | 130 +++++++++++++++++++++++++++++++
 dev-db/pgadmin4/pgadmin4-4.29.ebuild    | 130 -------------------------------
 dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild | 132 ++++++++++++++++++++++++++++++++
 dev-db/pgadmin4/pgadmin4-4.30.ebuild    | 132 --------------------------------
 5 files changed, 264 insertions(+), 264 deletions(-)
 create mode 100644 dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
 delete mode 100644 dev-db/pgadmin4/pgadmin4-4.29.ebuild
 create mode 100644 dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
 delete mode 100644 dev-db/pgadmin4/pgadmin4-4.30.ebuild

(limited to 'dev-db/pgadmin4')

diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index a09dcd1c493e..d1272f28272b 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,6 +1,6 @@
 AUX pgadmin4.desktop 298 BLAKE2B 9048ee03c9f8e05807f2907fd7dcfda9d76bb3cd3b2567676cf6bc9acebdf8d2b4de1626f9fe57c4940422766fa7e6fa9111a5bc9c252e34f72af2850813b158 SHA512 a083c525cf49543751dcf4f98a9e2607ce06c35a573c5a97d4088b21b41dc260ea0fcbb139ce153f0e1deb6bd8e6e75e69a6fe08ff2f4aa563d7398bd52553b2
 DIST pgadmin4-4.29.tar.gz 35389494 BLAKE2B faaa84c0eee9c92ba483f4adffaf9e39e0c5f8ea21630a9ee8fad62aa833c88aa913df50c760be740afa0696aa1fbf1b6902a8b5bfd322822472f7d2dcb295e1 SHA512 2c7d20d10c96712f41621c2862a6a6222f6d6dad4a0b3e1aaf04744e65744460dcae4220f61b27785e02c82a624fa0793df2ea9d8e83ac0a6de048455929e615
 DIST pgadmin4-4.30.tar.gz 36490656 BLAKE2B 3e8e998b29b13ced40b38106a468d047dea92a0cc930150d153c473e78045278840f78b3bcbd41f20a5017e68c1980c05ccf734bf63d8f107e0e02c2df54162e SHA512 7ce12f65ce9dbfe4af9e92dd7f9327a05be8b8436ef495a0634043158417f3af5f457b88ee5422ede59f517c197668094454c6d7b7c33e255068479ce6ec13d9
-EBUILD pgadmin4-4.29.ebuild 3922 BLAKE2B 613e2fdc1e4daa79bb5876c76a677f9d4f0c3a4d2c020019466dfe9547acb24fb42a534f62f9cb367e6734ed1d4a3ca98dcf07edcbafacd484b4baeef640252b SHA512 b0b23f05c33a073e84e17752520fbb41aa5b018258970fd4ff3ecd8f38773079e17ff6a330d58c5796c70df69269d42b4489a1f76095cc581c16390864862aed
-EBUILD pgadmin4-4.30.ebuild 4027 BLAKE2B 859d39748fccd51a24674762a054078af666c051b12087d783e1ada55256ba602a8fb4bb848735afd999eb28e765bbccdb043ccead8af67b3a5223f0ba749c3d SHA512 fa5c4a62d42df0f1fc27d2a3bb001d803ec928ae28701fa129366ab8a49b73ccdc667db0d8ea5e9b921084af8ce8c666996a5233165ec0fe67b5e9bffde146dd
+EBUILD pgadmin4-4.29-r1.ebuild 3921 BLAKE2B fee1e9acc4b834f380038e0ee7575b65f61429adf3c253510be1622a0e46f5c8b76e400f93b1d8ee5a219f0241db39bfd98fc114e1f83587d3c4bf11eace97fc SHA512 956d55aa74100025b20876b6df2307041aee31ad9a46e14ed7ee30eeb3ebff8d28ec53f4aa4c5345461a06086f7cb07b50a54f7d18cc1c76fafac4b65ae3ae19
+EBUILD pgadmin4-4.30-r1.ebuild 4026 BLAKE2B fd07d98cde16b80576889e10fc9e170c64a2ca3088f6fa89023f527980a46ec365c3f1952399f8d3db3cb31369959d43374d5fd2659a672d1742694a07b8d691 SHA512 cd14438ae823d2baad005e0c11d9255a946f5e7900f2c668cefba7374ea01bc4ab32d05ea64392bec45fead566833c7b9aace14190036f9d82ae801872df003b
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
new file mode 100644
index 000000000000..0423fbc67937
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/imagemagick-tools[png]
+"
+
+# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
+# git history shows this is just for compatibility with <python-3.6.
+# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's
+# git history shows this is just for compatibility with Windows.
+# 4.28; requirement.txt: Flask-Security was renamed to
+# Flask-Security-Too. This is still the same dev-python/flask-security.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		<dev-python/flask-security-4.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
+	eqmake5
+}
+
+src_compile() {
+	default
+	use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/.
+	newins - config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	insinto /etc/xdg/pgadmin
+	newins - pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+
+	local s
+	for s in 16 32 48 64 72 96 128 192 256; do
+		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+		newicon -s ${s} ${PN}_${s}.png ${PN}.png
+	done
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgadmin4/pgadmin4-4.29.ebuild b/dev-db/pgadmin4/pgadmin4-4.29.ebuild
deleted file mode 100644
index 1e90321652d2..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.29.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-# libsodium dep added because of 689678
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libsodium[-minimal]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	virtual/imagemagick-tools[png]
-"
-
-# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
-# git history shows this is just for compatibility with <python-3.6.
-# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's
-# git history shows this is just for compatibility with Windows.
-# 4.28; requirement.txt: Flask-Security was renamed to
-# Flask-Security-Too. This is still the same dev-python/flask-security.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
-	eqmake5
-}
-
-src_compile() {
-	default
-	use doc && emake -C "${WORKDIR}"/${P} docs
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/.
-	newins - config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	insinto /etc/xdg/pgadmin
-	newins - pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-
-	local s
-	for s in 16 32 48 64 72 96 128 192 256; do
-		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
-		newicon -s ${s} ${PN}_${s}.png ${PN}.png
-	done
-	domenu "${FILESDIR}"/${PN}.desktop
-}
diff --git a/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
new file mode 100644
index 000000000000..0d94e48163f5
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/imagemagick-tools[png]
+"
+
+# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
+# git history shows this is just for compatibility with <python-3.6.
+# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's
+# git history shows this is just for compatibility with Windows.
+# 4.28; requirement.txt: Flask-Security was renamed to
+# Flask-Security-Too. This is still the same dev-python/flask-security.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-babelex-0.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		<dev-python/flask-security-4.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/gssapi[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
+	eqmake5
+}
+
+src_compile() {
+	default
+	use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/.
+	newins - config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	insinto /etc/xdg/pgadmin
+	newins - pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+
+	local s
+	for s in 16 32 48 64 72 96 128 192 256; do
+		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+		newicon -s ${s} ${PN}_${s}.png ${PN}.png
+	done
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgadmin4/pgadmin4-4.30.ebuild b/dev-db/pgadmin4/pgadmin4-4.30.ebuild
deleted file mode 100644
index 0c5448e5d15d..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.30.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-inherit desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-# libsodium dep added because of 689678
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libsodium[-minimal]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	virtual/imagemagick-tools[png]
-"
-
-# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
-# git history shows this is just for compatibility with <python-3.6.
-# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's
-# git history shows this is just for compatibility with Windows.
-# 4.28; requirement.txt: Flask-Security was renamed to
-# Flask-Security-Too. This is still the same dev-python/flask-security.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-babelex-0.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/gssapi[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
-	eqmake5
-}
-
-src_compile() {
-	default
-	use doc && emake -C "${WORKDIR}"/${P} docs
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/.
-	newins - config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	insinto /etc/xdg/pgadmin
-	newins - pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-
-	local s
-	for s in 16 32 48 64 72 96 128 192 256; do
-		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
-		newicon -s ${s} ${PN}_${s}.png ${PN}.png
-	done
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-- 
cgit v1.2.3