gentoo resync : 20.03.2021

49 files changed, 163 insertions, 155 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index caaeb64b2da9..86598e87a30c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
index 41d48b3dcaad..0fb66ad7ce3a 100644
--- a/dev-db/cpp-driver/Manifest
+++ b/dev-db/cpp-driver/Manifest
@@ -2,4 +2,4 @@ DIST cpp-driver-2.11.0.tar.gz 9392387 BLAKE2B 37d6063b33cd9821faa15d0eb8cb7e87d3
 DIST cpp-driver-2.9.0.tar.gz 9178108 BLAKE2B 22c51d050dc65303dd6b584f0a89e510905bf084ff5e45a543666675a4e0b904c11895c9a7dd3d0df2fb12c1e2e58e8530c4113706c8b2548adb0b6f9431419c SHA512 45c6d58b1d287d142c9d7d6b1e28114683648a3634f44b185208fa44da64d4c8a9d485b3956a0cf7429e96f74faa588de832de30265dfa17782ca90e8163a0c1
 EBUILD cpp-driver-2.11.0.ebuild 613 BLAKE2B ef569879f623a411b2e92060b2b6b3854e6a1ab3e58cc89b00f980bc3d15225d0a21582d731bdf53498eb7adc604a0d9db95251f3d54ee2f08fa27088ba2ce2c SHA512 63d19c7b45eebb4099d206cb5ada28fa9adcc52297ad7b07016cc929022a72edd4e8ad50a88dd02b3d8fcca84901d716386e64f2f6aabbbaa5dd714d55f8a761
 EBUILD cpp-driver-2.9.0.ebuild 625 BLAKE2B ab741c2ba9d2039bbc1743d6315c8374e148b0e3fc37ef62b50514eb628ec5d53915363347b85e76a5cd0e50a491f770692c7445ef743a65aaced9087ff33096 SHA512 46374aa29a2a0d2bd213cec83ca1a4ebd24704d5ecebaff334d1c81d501937aab164640f8ce5dbb17c26c3d367f6eedaf50e0a5dbec9bac98bac28e177da85c5
-MISC metadata.xml 676 BLAKE2B 48e5c2f895466b330017e6c13f15eb49f41f3e317250dbce3537210895f9234568b1470af0fe1bc7f88ccf40a01ce340543ae6176e46f9a89f26f3751ece50a5 SHA512 dae7394f2998715c2928fa0d4200ebe222f66328adbdcf51e5a1d1d25f5d1f7e48e5bd356236470dbbe36ea18477617b5da02cfa70365bb74c4a2d1428e12ad2
+MISC metadata.xml 706 BLAKE2B 8acb71ef303196e20bcd2cd4f7ef8e3d1d0a865dd06cf1a1e393ecce618a456c4b4e338c04a5e7d03a98fc3b885cf6b293337a8910d121f7e54bed25508a4c41 SHA512 6088ea69f298ba254779116d0e0a12946554da18a9e6b2e8b638de0f579a830fdbd17d3ac4d9f2c4f69bed02875997686d1b1fd4d01707235f6355c5cfeb7b10
diff --git a/dev-db/cpp-driver/metadata.xml b/dev-db/cpp-driver/metadata.xml
index 35194b53a268..3690e58ab74c 100644
--- a/dev-db/cpp-driver/metadata.xml
+++ b/dev-db/cpp-driver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -6,11 +6,11 @@
 		This driver works exclusively with the Cassandra Query Language v3 
 		(CQL3) and Cassandra's native protocol.
 	</longdescription>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>geaaru@gmail.com</email>
 		<name>Daniele Rondina</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/gqlplus/Manifest b/dev-db/gqlplus/Manifest
index 3c82cbe4b124..aa41c041cfb8 100644
--- a/dev-db/gqlplus/Manifest
+++ b/dev-db/gqlplus/Manifest
@@ -1,4 +1,4 @@
 AUX gqlplus-1.16-ncurses-tinfo.patch 485 BLAKE2B c5a38640cd4a1b072fc0f966095041b9ae463e6a2c577a822e40bd899f061f11b42b4c0bb8eca4a2ff9064251a69bfef508c8b63b31953da45061e801b337f17 SHA512 4b9fe6e489d12e021384979bc659a75ad60f704ca485320893d42326aece16720c8d02268703b3bc8b45527197dbbe85cbac9d7ae9133ff350718b874abb4382
 DIST gqlplus-1.16.tar.gz 2128428 BLAKE2B 5d2ad6cd58d7a5e0e6ce0d54301d70ad452d34a9636ce1f831d1b6d1de3bbc0ebce3d92ed15c2b8da60107d49c56c306543c768c0ef3534f34d2d545b80c43d7 SHA512 e9d7685e4db741db8232f7ba7a05df59042d0cafe198060adcd37aea2d3878e785eacb1f7b72fcb154558d1be8c619818dbeceffaefb75e372a18ed23e234512
 EBUILD gqlplus-1.16.ebuild 806 BLAKE2B 0e670ae099780beda48b434a2f6e13553c95316ac28c84faccdc3b36dfb2396f9713b25eca594672f03b8884fd324dc2f032b00d8df37424521a2ca1156b209d SHA512 7d5b310253539b0def3d8540115d1796467057968ea9ef175cb71885e54e539efb69fe613e37ace4e8be910b1e803c4f0212b71750c9d4b55c1cabca2b1af618
-MISC metadata.xml 620 BLAKE2B 82537c625dbd12eca6562acf5605a5b3b6b1841dd946d2f5dd17a1730bb340f49837f3bea3c9ea6f830abd4c0ecbc3751d218a8daf843f65ca4bb292a5a355be SHA512 8ce9a86e99c4198a246b149f5a526f0cf70ea9e75d3e97bc643520c9377136e83ca56ac47869ae0b62f021dd28da6745204c7c12a52a82e996949b4a796086ce
+MISC metadata.xml 620 BLAKE2B 1bf8eef6669e88237044223573dd13252acfbd1ce2357a8c3a8b54c10b55aaf3acb2df040baea23b4cbaba487579263362c054131023e5e8da183f2257dd9ba5 SHA512 6d73381bce688df3aa4717c419131798673cf83c14cff9e32b6391d6c8d7df470285a7654c4f68370b2166b48b3abcf4a6d1715bf8d257a4a937e73e2a88ee57
diff --git a/dev-db/gqlplus/metadata.xml b/dev-db/gqlplus/metadata.xml
index 533ec708627b..06ac859c58cc 100644
--- a/dev-db/gqlplus/metadata.xml
+++ b/dev-db/gqlplus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index f0f6a4074d42..1f90304d10a3 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,4 +1,5 @@
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e
+AUX libdbi-drivers-0.9.0-slibtool-libdir.patch 564 BLAKE2B 7effa5db121872b079af2919b56857fda040f9712a10789ba3e4c4352a0b172127026f1df9c2f93071cf78a14f05431557e23e63b74f52df87710942d9c14711 SHA512 9f4ca8fd4147ed1c619c2d7ac40b4d67e67f3f6f940568647dd1782a705a52cd3d10241b2c4039ad8cca2ecc7186841640ffa44fd56d5fc9d19a7e8f3fc974ba
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1
-EBUILD libdbi-drivers-0.9.0-r1.ebuild 2170 BLAKE2B 84ee219333a4c1aecaf6f6bde7fd1a237c2e5b4d19edee27d7beacea85173ea492ad2fcda12afa4660fdd4f690555a99ea7004258165fee5fcd760afa814c8ec SHA512 23b2842089bb96164f09ff6a8ea4ae80c9e451418d7dc50babde784c7ffc755740dc91433d48f6e045ab418c84fccb41c71f4ae64a6c6ee7e97a67e232f466a8
+EBUILD libdbi-drivers-0.9.0-r1.ebuild 2215 BLAKE2B 677085541cba057c53e0c2fe5658ab3e682af6305258a5150cb04dd20f9d255a0e0330e064097981d4eff3e2e0787fa848afc43dc36bbe9491c8d8f98842aceb SHA512 6759e67116de90a12467bc5d473333917e45048a20a1906fb426445e002bcbe5715d8c578eac15f678032fc43f6dbb251f98f3bd5ea0028a538ef69c3dcd8b3d
 MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch
new file mode 100644
index 000000000000..4db7485d33de
--- /dev/null
+++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/775878
+
+commit efbee1f631981bd454051d20796f1cd52fe16f00
+Author: orbea <orbea@riseup.net>
+Date:   Fri Mar 19 09:01:22 2021 -0700
+
+    build: Fix the pgsql linker path.
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8e89af8..7504d63 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -191,7 +191,7 @@ if test "$ac_pgsql" = "yes"; then
+ 		PGSQL_INCLUDE=-I$ac_pgsql_incdir
+ 	fi
+ 	if test "$ac_pgsql_libdir" = "no"; then
+-		PGSQL_LDFLAGS=`pg_config --libdir`
++		PGSQL_LDFLAGS=-L`pg_config --libdir`
+ 	else
+ 		PGSQL_LDFLAGS=-L$ac_pgsql_libdir
+ 	fi
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 81c597acfdfb..74c9b7367fbb 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,13 +6,14 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
-IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
+LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-SLOT=0
+IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
+
 REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
 RESTRICT="firebird? ( bindist )"
 
@@ -29,10 +30,11 @@ BDEPEND="doc? ( app-text/openjade )"
 DOCS=( AUTHORS ChangeLog NEWS README README.osx TODO )
 
 PATCHES=(
-		#"${FILESDIR}"/${P}-fix-ac-macro.patch \
-		#"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
-		#"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-		"${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
+	#"${FILESDIR}"/${P}-fix-ac-macro.patch
+	#"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch
+	#"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
+	"${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
+	"${FILESDIR}"/${PN}-0.9.0-slibtool-libdir.patch
 )
 
 pkg_setup() {
@@ -83,5 +85,5 @@ src_test() {
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index 490e260316a1..4b65bb1ba2a8 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -1,5 +1,5 @@
 DIST libzdb-3.1.tar.gz 720162 BLAKE2B 2ad8ede7e2a1c0ee831ba546b7756d2688bcde83b537e812c12ab3d42d6bdc13526778ae68b61584a52569f0b42fbeb8462efe379821295d855f585ae3420df4 SHA512 7cf24ccf0f0a938955d8b54af2c6eca8a8f700737beafde9e824129f324511e06adbc11a3fdbd6ad6d9b902fdae6f7caab4e5c1c594d2211be314e3a24c697f3
 DIST libzdb-3.2.2.tar.gz 752292 BLAKE2B 449fe1cf9ac7196473ab45593d197ea9d02a91bb3b0efaaea91b3c95bb22de1ced68704835e542e092a9f507e8f2484a141e021721df84e818a18a36214f7c40 SHA512 1e732f8785322e0369de16a8100c9467e96ad1ca4eee31e8bfc349f4f17d4cc237a691addc060a66e1b46bcfeb99c3aed07b1d5dbe20e70fde4ffbf35dbea2eb
-EBUILD libzdb-3.1-r1.ebuild 1987 BLAKE2B 7747fd2a24c9f45fbd2713d931a41368369964635466442b452af6a1ea38e1b187d26a424981b76da1a9796dd45a94d00fd3f79a2b43e6f9e855e3b0c6b2b719 SHA512 735b7ed0579a6cdc95dec473f6fc0d15891e51d2068ccedec1188b163a3afa285603a32f68352df88c7cd3f5bc9dc15da6cfb41321b4a2b09efd1231e2dfb0f0
-EBUILD libzdb-3.2.2.ebuild 1989 BLAKE2B 33e36d7cc7b73aacf23215e4a40383338faea0140ab926367c0e971f1529725b1673042f2ddd4113461db31ac0cbe8a086ea892f0588618a9f5774de1796f271 SHA512 c1c1c9c0864221f2a90909d0ed994f8c36fc16f461c67b46d07c7effd3357f570bc59f5dd6fd5cc9036401dbb442212af3ab36723bb8848c2831aeebddc58b78
+EBUILD libzdb-3.1-r1.ebuild 1989 BLAKE2B d492521d60979d4b135d8c66d9612fe6d09a85897f9bdbb10c6f879119f9aaa1dc32b4c9366fbf8c09ff858690375572b7626c4a60cda90c484d9c011c4769c2 SHA512 ebd106e30eebd9a9e52128433f68ebdd9c8cee3f877e5eabcec7469706209f3d7a18e6b7585288bb85a65c412d99ca1692c9d5fc94895bc0f022e83b7efc0b3e
+EBUILD libzdb-3.2.2.ebuild 1897 BLAKE2B df6d11a904408ed4b1250d8d8b51811974bdc61794b03d90641a477d7b13273acc8802119f40224a4fe9fe20e503b3e4f11e58bef3ba3c2d4f0ecd296d82f91a SHA512 7637ae90918a3ad11534ba1937e769c0596cb02724b267b90193411e69beece521660540089c6a89f7ba1dd7deeae6abcf24c5145e864943db107ba4977569b5
 MISC metadata.xml 258 BLAKE2B a542b7d3d6fe41d4d6804f23d3f4eae32151dd6a261fd9c53df59afc03381e2621ef74094f612a796d2bfdcdc994b210f47935bb396e4ceb58e9901ffbdbd50d SHA512 5744904454b157ef1753d1858d293f35e7aa0d9c513a96823f5efc1ea7fde3bcbe2a50ae70f56be9c9c15463b820d45fcdfd52773a58d078252aceb0e93992f6
diff --git a/dev-db/libzdb/libzdb-3.1-r1.ebuild b/dev-db/libzdb/libzdb-3.1-r1.ebuild
index b3ba017bb1ad..2e86113710c8 100644
--- a/dev-db/libzdb/libzdb-3.1-r1.ebuild
+++ b/dev-db/libzdb/libzdb-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE=" || ( postgres mysql sqlite )"
 RESTRICT=test
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
diff --git a/dev-db/libzdb/libzdb-3.2.2.ebuild b/dev-db/libzdb/libzdb-3.2.2.ebuild
index cc039a65aee6..eda97e8cd4e3 100644
--- a/dev-db/libzdb/libzdb-3.2.2.ebuild
+++ b/dev-db/libzdb/libzdb-3.2.2.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE=" || ( postgres mysql sqlite )"
 RESTRICT=test
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
@@ -28,8 +28,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
-	# Fix detection of openssl 1.1
-	sed -i -e "s|SSL_library_init|SSL_CTX_new|" configure || die
 }
 
 src_configure() {
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 75bdf1c4ef25..68f84dae2828 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -9,5 +9,5 @@ EBUILD lmdb-0.9.23.ebuild 2243 BLAKE2B ea9b523973dde81ab257ba7a7b25ce41a3942f5cf
 EBUILD lmdb-0.9.24.ebuild 2263 BLAKE2B efc56dc416bc96dcf55e24fe2f757fe23e7194ee46036df50600a0794bdb44a1b9e892e6b00acceb467ef1a08a021eb22c66272193cf1d282dd733f9cd6e743e SHA512 05ac018fb64cc85ebb3f53c62c6094b46701239dd99fbe048e164bb0a180d15aff76e42a876e80a61484b864d98eff7da0469ae7ae40f6a9c9b3ab8f04bfb478
 EBUILD lmdb-0.9.26.ebuild 2341 BLAKE2B 6a6edee5b90634bd0cb802b9b467ecffdf0bd0a3fc255ac2ccf601b1048d2d1cf45528341516c09f90d3ff4e1f3078f5665019f0783fdf71835176f076672c2a SHA512 1a21922d2a95b5de62962b6df10768079a608f7819fc3d00d34a260dbc251c88edc7f901dd8374f4dd31d8c87b631e9ec3fb1bb68474ca0806df0be4a236e8b2
 EBUILD lmdb-0.9.27.ebuild 2341 BLAKE2B 6a6edee5b90634bd0cb802b9b467ecffdf0bd0a3fc255ac2ccf601b1048d2d1cf45528341516c09f90d3ff4e1f3078f5665019f0783fdf71835176f076672c2a SHA512 1a21922d2a95b5de62962b6df10768079a608f7819fc3d00d34a260dbc251c88edc7f901dd8374f4dd31d8c87b631e9ec3fb1bb68474ca0806df0be4a236e8b2
-EBUILD lmdb-0.9.28.ebuild 2431 BLAKE2B 77fd8d723132c07d8458f4734c4bffc2c81ea36a2b028f13b702e1be2bc0991dd4367b2630e5c9b5e72dfcd01574c094d554657e0544abe871670883c37282e8 SHA512 9464f89f1b805b834397050e9da47f91aaa30d9976370d19fb2147eeab9d2c3139913fa533600f9efe889c1d806f703a8b5c554bb2979aa7a22eab1a18bbedd7
+EBUILD lmdb-0.9.28.ebuild 2425 BLAKE2B c2d3dede502a94b7c6800444c857fc5bb81618e2dc441f89f74ea110e335e2ed245707fb312d610a3679fd8a5d294dc085a1a37aadc4d20eb6e6c81e8f84d1de SHA512 c0bc7b2d2d30429917f420ef05c64a87fb015457ae005a31a6d4a1e2127f228f9076f26399486acd2f27fdea973bea825419cb1622d894e4272c043aeeec32bd
 MISC metadata.xml 432 BLAKE2B 21af6c7ba636803d33bf8877d93282327ab14f0688657115cfc2d23bf40b0f1c556cdf7238460430347570590d8ff2441f8186b5f15fa48651f12e8fdef846e4 SHA512 5feed30bc7a5a51b41f330de6446ab4f92826d2e1c216f0eb994d3e6e55b596e0a57369d51f11fc0151acc67da5d6b0d169d2394de1bd4790f2eba0eac1a21cf
diff --git a/dev-db/lmdb/lmdb-0.9.28.ebuild b/dev-db/lmdb/lmdb-0.9.28.ebuild
index 0b02e87102d7..270b26e5bf16 100644
--- a/dev-db/lmdb/lmdb-0.9.28.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.28.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index eb35cd113ad5..735b9fd5d14e 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -4,4 +4,4 @@ DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 318e5a269c6f4584
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3 SHA512 ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d
 EBUILD mariadb-connector-odbc-3.1.11-r2.ebuild 1998 BLAKE2B ef765a439df34b0b0bccfc84565f829b84e3a56d66390b5c00f2c53f3f3568153c81c0aca762231b09f20ff02d307b42106144ba16841a5b04c25c89b8f64510 SHA512 4dc27c27a4557174e7ba9e6f3a1232cf9d5a57024254a0b7a8c8a087bd18d5776f0ccfbece99335662360909b4a8a354b278733669a8865da01a96b6a243db39
 EBUILD mariadb-connector-odbc-3.1.6.ebuild 1700 BLAKE2B ff213bb689fb6d20754b313eb296da1bbd93d87cb3af978eb87b021321d459f2bfe0354340a370ea88054e509af34ca311924ebad0fac3843491b9bf84fd6ab5 SHA512 0ad3a6f1e594fcdb6248f6eb39cb54a85f4a0c59f05b82b1c2ad4037939a227ef73983a34a01e0c9c40d9b5a2bd038dfcc85d3d91ea6f6121dee5e397ea523b6
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/dev-db/mariadb-connector-odbc/metadata.xml b/dev-db/mariadb-connector-odbc/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/dev-db/mariadb-connector-odbc/metadata.xml
+++ b/dev-db/mariadb-connector-odbc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/metadata.xml b/dev-db/metadata.xml
index 7ef0dd98662b..d761b11d8fbb 100644
--- a/dev-db/metadata.xml
+++ b/dev-db/metadata.xml
@@ -37,4 +37,3 @@
 		programowaniem związanym z bazami danych.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 05cad9e3f9c0..a6795cd3e663 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -3,4 +3,4 @@ DIST mydumper-0.10.1.tar.gz 63967 BLAKE2B ad2876eb4fd6528c119d722e70b096d1269811
 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
 EBUILD mydumper-0.10.1.ebuild 1055 BLAKE2B 1fba1963ca58f425fb9319aca1507bc895eb717f8f2ffdec3741003187e0203f7493191e62d3475e057c6e2c4735ec2210355705fcd24750ac73e850740a9c16 SHA512 867fa644160a44955f4be27eb2a82bb10be73d5e1a9c80850e7ea5bf34f00410e0005bdfc963df4a94439cdc54ba8b22178481b606fa0d8d33eb94f96c6ad1dc
 EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B 5561bc8e94a28d6676d6673953b970b05f062a48d25a2ef280a6cf79a9a881081b936e39260d34f46719a45085b4201511a10af0a00441008218032a5aeaafd5 SHA512 fe5ab2d9ef8f9d4067e61f376e9867bf48b49029666d7e85182aa1ad774fd9177936e311e9c31fd8835a0494712cf231e55097b393b01c084712492245f507f6
-MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
+MISC metadata.xml 478 BLAKE2B 75bc3d3ed6095b767a4fa6488bab9c98c693370eccc11508a56647c8d45a3d909cd08cf0deb93c011ccfae5f727e9942e90b340ce7a70e7e514dea3e2e894cbf SHA512 5410f1bd014a5de0fd9a0e0ab85c6b2955ad761619118b549a1ed85ba76f1bd785cf89099c6096aee20d43ccd849bb90840331bff80b94611cb27cc0c2ac3460
diff --git a/dev-db/mydumper/metadata.xml b/dev-db/mydumper/metadata.xml
index b7a839d9622c..54e28fa43fa9 100644
--- a/dev-db/mydumper/metadata.xml
+++ b/dev-db/mydumper/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 06f5cb9c1254..3b9e9b68561f 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -5,5 +5,5 @@ AUX mysql-connector-c-8.0.23-libressl.patch 13374 BLAKE2B 991f1e921c3f06937c682e
 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
 DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 3a7d3e05c774085d6078d0d3effd58d2df47521615356a2aa5efc2ea2ef8457e19ad57a054926ccff0a4752ca71d0464daa7fe9a3ac6c1b1d3bd86a9a82dfc58 SHA512 b8c2e2ac772b7b730f8b3bac7a5afb205da173b3639500606e7d1fac74832a0134027951855a2dc81af015e6158c924927ad63b9e1f2e7c823d45d4c4961c3f8
 EBUILD mysql-connector-c-8.0.22.ebuild 2904 BLAKE2B b46f1757bd0d1f4ba6db5f9c029425e57f5f43b379ce121fcffffd0d6562f747b81f980bbf22cec610fdb416192b05368cd9cb45362e296d6e851de6d5ed6780 SHA512 e8de286e91c74a9cd65396d713372fa13d793a719bd702e9116370659194b001a221881051f0bc9c46f3474336e7d134177b1bd35883c09e0e0c3f3c5e0902e5
-EBUILD mysql-connector-c-8.0.23-r1.ebuild 2980 BLAKE2B 77204b68e7322efddef3db0adaec920f596b960743adbad721386947195f7faaf6707bd2217d0c566fb5eb9301d29aa913eef3fee77a5cf946973fe1bd7386ce SHA512 cfe53abf698a40f57e51af85d5eef0315d89deddfc73c5dec4636720271225899df31c917c34ffe1f0119dcb39e66aae826456b15fa9177fc100257d0bc3badd
+EBUILD mysql-connector-c-8.0.23-r1.ebuild 3109 BLAKE2B 061ffdc701798e2e6b743b3fb22827a82bdf79bf69abdf458a4774f08a5afe5b861db5aee923c49ea134f652994583f0195878dba0fbd8468d65b262b09cea75 SHA512 f4890724a0a9e488f2a3d1751b331d57dfa617fb6e72f2669df7fe3f391b00313bb555203491f5a587e1eba8cba52a21e301a8e4a73b4a7f268beb9f0b56b4bf
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
index 1abc77fe9934..4923fe57f0c3 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
@@ -11,11 +11,20 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/"
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+
+	S="${WORKDIR}/mysql-${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="ldap libressl static-libs"
 
 RDEPEND="
@@ -39,8 +48,6 @@ RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
 
 DOCS=( README )
 
-S="${WORKDIR}/mysql-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
diff --git a/dev-db/ocp/Manifest b/dev-db/ocp/Manifest
index 973d7f819ce1..512f467a8a5e 100644
--- a/dev-db/ocp/Manifest
+++ b/dev-db/ocp/Manifest
@@ -3,4 +3,4 @@ DIST ocp-0.3.tar.gz 156447 BLAKE2B 0c7f8743fe4ae46c3b9d95847e39c51fd1b829af9e9a7
 EBUILD ocp-0.2.ebuild 732 BLAKE2B 4d7301cfb319b4e40650ff6c9995d7f9807bfda90e581699cea845557f56aae666a1aedfea375e2d2e24009028cb11adf59147d419bba2c1e2765b4211cb74b0 SHA512 447f0a33d07797e6dd5fbe5fc7f62ddbe853e4d038f5ba1da148c92311d38ba19289c17166c5f4a9fafacb7e22eb4ecbfafe60dfff18cfbc6ccfae29c73c287a
 EBUILD ocp-0.3.ebuild 678 BLAKE2B 17b27bd004c3029dbf9e7fbb407402cabf34b0e7e99b6e6b0244df1dfbdf7320ba138bdff2b353ca55e05a6bc84d1a3a5db1adbf105a0f236ca079b563217e1f SHA512 d13112e8baf2d66602219122b33d375c7816ca289e2f0c652fee7b3b30c974ae99441c979d03ba5a7733c6f3e497017eb3426d47e9fb4acfe3c1c6a164df9114
 EBUILD ocp-9999.ebuild 678 BLAKE2B 17b27bd004c3029dbf9e7fbb407402cabf34b0e7e99b6e6b0244df1dfbdf7320ba138bdff2b353ca55e05a6bc84d1a3a5db1adbf105a0f236ca079b563217e1f SHA512 d13112e8baf2d66602219122b33d375c7816ca289e2f0c652fee7b3b30c974ae99441c979d03ba5a7733c6f3e497017eb3426d47e9fb4acfe3c1c6a164df9114
-MISC metadata.xml 614 BLAKE2B 218c867c70ad619570c2c9ce97bc8fc5ea1ba9b121db0e05e0fb3046d7b4e7fcd3e467fbeb57d72715604d1c457b4aa44649a78587d29c61b9a63d19775f3b9e SHA512 33281a9bb09cfd13ecae433df9612587d56befe35f81e50d88164b0b4caf997f404c613ae456b497fc934fae9b4837846a18a2cf714c49bbc0b0b6eb920fa77d
+MISC metadata.xml 644 BLAKE2B f7498f57e2fdbb2440bff4e3f4c39f24c1a9cbdd3ce5c5695d429d139cd6de8cb6c78f77515e031c333c97962a6ebd6226ee2ba817fcef468b9edf0b620b1cbb SHA512 87267932f099a05230ff28521792cab03ea80d017fa674cca853335b6304c709d511748b1596b422d15b65d253a340b0cec48f3ca22db7ffab8450738996065b
diff --git a/dev-db/ocp/metadata.xml b/dev-db/ocp/metadata.xml
index 1d5044264397..2ae5aab128c0 100644
--- a/dev-db/ocp/metadata.xml
+++ b/dev-db/ocp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>maksym.satula@gmail.com</email>
 		<name>Max Satula</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/pgFormatter/Manifest b/dev-db/pgFormatter/Manifest
index f6fd84362f40..dce8067b1617 100644
--- a/dev-db/pgFormatter/Manifest
+++ b/dev-db/pgFormatter/Manifest
@@ -1,3 +1,3 @@
 DIST pgFormatter-5.0.tar.gz 1311094 BLAKE2B af9a730e50d09920026dd50794c65e11456c8ea38a6f4793d6bf85d7d3afec37c114f098551c72da25fe1f91bd72845c80f5f0bd96472003d5cba182a0ec5a6b SHA512 0b192c176431eb8c59a30783bc83d5ce2451ee240d08c95ac1cddb899e6c201f01601858db8019a2b967c9d31dcb710da781d06fff694295dba1a623c1c9eb19
 EBUILD pgFormatter-5.0.ebuild 351 BLAKE2B d2f706cd19065bedfe6617990123dad601f4ddcbba57bb73f23d05b741d99927244d46b1e6e5926dfbe4dc58b68841cd92f99640c7da316a984d3aa5b1280166 SHA512 04c860991ddea29ce49fb12d22ca14d13a010b25659909d794b0e359690d4b5b3fe1ff8acb629bcc2abd5b3e9973b2b04b05cec14ef1c4b81abf2f8babe7e3f1
-MISC metadata.xml 373 BLAKE2B 98b377a3549b3bd27492c791b4fbd3556d3ba98b8736a8e26a162cc2427a4209340cb28391574d9d48ec91e8ce6e164c93d00c1ccc7e1cb817514c15e6654f18 SHA512 a66667075db4298d870c447c3c9b0d84e4022766d50483774375025457f8d01b4cf7a1507a73fc3435813b85559af3d16fbf276351dd1e3d096a3e1699fa6c13
+MISC metadata.xml 373 BLAKE2B 931a577bae37200c49d2c84ab6f626656b8c39c757288f9aa705a13c21e46dfd6e433edb3566720787556e9d92decb55a920e56aefd8a5430321b4507d478717 SHA512 1fe6c6376e99e2bfc05017609c7b308504b1b1f5a54ce09e45c9d004e4b02ca67e775116c7d263c297fa9f4f6720af6887b5e43032b7c3c8913d61e9887e66c3
diff --git a/dev-db/pgFormatter/metadata.xml b/dev-db/pgFormatter/metadata.xml
index 79a51a6f7526..83ed1aaf1a99 100644
--- a/dev-db/pgFormatter/metadata.xml
+++ b/dev-db/pgFormatter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index fb712860cf2f..c95a7a7c161e 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,5 @@
 DIST pg_activity-1.6.2.tar.gz 127561 BLAKE2B 5ddebd3068ddc33196903892c01b947ffc50ecff7ec790e196626e87ee8933ff79242e3ba61c207ea1020535c5d85dbbc4ac9e4825a19ab98004bb27ea0b6a6c SHA512 fd743f369201c6ec3762373c39969b2b7632d79a8fb9c8ebd12a88b66b91915c30e445e93162844b4a176cf7e13009c9c8136e973180b00e7cc708ecd66b4853
+DIST pg_activity-2.1.3.tar.gz 277297 BLAKE2B 9677ebad581e2e66e266e5433454e054274693a8e2e5a959c5f807ec1641f3b02a4c202eac7bddb7abe7e51e131d32d25a513a439e97aca996e79be6e1e9c0be SHA512 e28c75d1b88f6b530820d82327d6428d2388341bd09ba4efec5e80e753aee17e995b4e6d5ee8b35b3b972f20aa1228d525fe0c4bdcb8e365795d568a4a25c076
 EBUILD pg_activity-1.6.2.ebuild 624 BLAKE2B 023b6368bd071c1fc01eddac90d205293bf0d6edde9a315e8549fe5c20ca8e4fa7048213a9e5e1ecc83c0d8241868ad3593de6fcd572ddead29198a62c9e8704 SHA512 121f3dc7c5d348d27bfd999e5d4dce387466d4a593dfa0aab4f20f1a1d6af80db03c617d340e3976e59b5c3e6fdc63ce73d8201241c540e53c3c1deb1e501151
+EBUILD pg_activity-2.1.3.ebuild 988 BLAKE2B 69eeb374337b00713cb593f0ba2eee64bf644aec89183105678797205b871ed0e1c67cdb0754eadad4694dbe951d41a4ff544c63bf14d3906cff4a4fd09c694b SHA512 4a03d3b88b369f1be169ca542a0e567d4f4099bb729929d1a428473bf9de9174c254d60d0cfc9ed8b9ae95d0214a50da3f6ca5f508a66900a21cd286d6b318d5
 MISC metadata.xml 339 BLAKE2B 216c15e347a9dd6061fa95a90fe2a6b5b14f9dcfe7dce8a36376f28dc1c30bad6ae505247d1a5133bf9d8c1d0d61aa07b0f827f1547d563a5046a40e300896ef SHA512 e4b44855c8acd726e3e43cf79e4706077edb2cbccb955ed70c3fe44ee91ed604a057d8b612e4f3950387ee8c96b3fc77fd8e5696e63b896280a243506c7c8853
diff --git a/dev-db/pg_activity/pg_activity-2.1.3.ebuild b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
new file mode 100644
index 000000000000..745e50c6b85f
--- /dev/null
+++ b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
+HOMEPAGE="https://github.com/dalibo/pg_activity"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="POSTGRESQL"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/blessed[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/dalibo/pg_activity/issues/201
+	export COLUMNS="80"
+	epytest -k 'not test_ui.txt'
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/${PN}.1
+}
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index a40e01f1d0c4..ad17176371f5 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -6,4 +6,4 @@ EBUILD pgbadger-11.0.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4
 EBUILD pgbadger-11.3.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
 EBUILD pgbadger-11.4.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
 EBUILD pgbadger-11.5.ebuild 455 BLAKE2B 5c4abd9e9026bee497df8b5366fd3bf09e50cbdd72eb7b6cedbc12eb5557223c22407a399dd120e0808dfe1ea4f3f2adc300f9c6d1a6b7f0057b92cd10b77bda SHA512 25cf5979a60d87314aba054a86c47fcc496e167392fcf1018605a37e76fb3ccef45536e642baf4de827648948c1d0e1321da1dc7e1554721eebbb9a059d7aff4
-MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
+MISC metadata.xml 413 BLAKE2B 15cb832ee856b856530026c2541f520feb59b15d345c66d9851168df6502c0e9b596d1d6c9412af66dca9570302a6033e43aed906b8950fd9f3b300684b32285 SHA512 3ac9450fc26e5e683c219e638cce3caf09f4a348926a5c863f7d3951988a363920349c29b00b6791e7d414439971242866f7d2d2901a26014f2e17b0e83bf791
diff --git a/dev-db/pgbadger/metadata.xml b/dev-db/pgbadger/metadata.xml
index 5010c08906f3..d1e69cdab335 100644
--- a/dev-db/pgbadger/metadata.xml
+++ b/dev-db/pgbadger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 2c98269e44a8..beb9cee7168e 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,3 +1,3 @@
 DIST pgcli-3.1.0.tar.gz 441939 BLAKE2B 2c9c9a3afb233eee6f88d304e26e482760f1ff2a458103a80ffb80d877f63bd3ec74ba4be06238e8d78adf36ec251cd27849e0899f3b257b75ac9585f3c04572 SHA512 458871bf7ea0a83a66f44ecbde88590ca2aa08420a58c97d2716d4e36c61738d92283d007fc3968063daa01c25b2c46360292ad6339757c119ff04891e1a1c46
 EBUILD pgcli-3.1.0.ebuild 1011 BLAKE2B 2eedf2e0abfff372a260ad99fb445480b71f4af68af07bbd364e734bde47c92148b0456558bf43658cd321da3b52490209d264ad390b8245263a0fd44f17ed1e SHA512 b644c1e97ca4e5fe88cd3a174aef4d60626f0e8502cf783e55a646ec040af27e3bfae10b70f92ea0ce2aff33f5dfa817aa09c0d80e15da934d5504c4e3b342b7
-MISC metadata.xml 485 BLAKE2B 635bd7fb0c4daa7b5cde8497c3a6112b320484daac2e27c87a69986f6e611db5723b97b7349c8c11ccf84c4ed4a2ec06e8a791e092d65eecdcd69248271828a9 SHA512 302332f48f73c36f9336b6bb53232a1acfb18c6a4ed3c4b90abb611592d43823c9c0c270fcd872866916f727eecfa85ea5228706d67bd41f16eb82a0f6dffae8
+MISC metadata.xml 515 BLAKE2B d487fac15c86cb09b5527e462385a290345dfab312b429f0e8582dc060af10eeefa1aad4caf80d8cf4f0b76adc8517130027de9c03667b88ae0a3f54bb97d31a SHA512 843c56959c88ea1b6fdd3cdf7d09142d1261bfc37355f2c790c3f4f2f325535c984f2cd4f70444a1a2e4c7f6148a57689f8351f76b7ab19111912d6f005067ce
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 22ae05489b8d..4dea25618d51 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>jakov.smolic@sartura.hr</email>
     <name>Jakov Smolic</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/dev-db/plr/Manifest b/dev-db/plr/Manifest
index 5a2a5922f33d..10e36cf34f9e 100644
--- a/dev-db/plr/Manifest
+++ b/dev-db/plr/Manifest
@@ -2,4 +2,4 @@ DIST plr-8.3.0.17.tar.gz 74017 BLAKE2B 314b4cfa2c3ca8ed31e80a72233a6dc8cdb9f3811
 DIST plr-8.4.1.tar.gz 265142 BLAKE2B 859913ba14d3e6876eb5a3d7593346b98ab2e1b6c70d9fd9cc7e1810fe11ecb3c552305485735cf975cc41ce2de6cbd7bcf407c9e373fc4024230be797c9899a SHA512 0db407355271009bad95c21f81e544839322f0fa0a63d2abd8edbf9eab8f61e208a3e4f7083729cc8247411885197ff3569c88264db0a29b34523dc83bbed7ec
 EBUILD plr-8.3.0.17.ebuild 1700 BLAKE2B 441f233545359ab8d171834c88564883acdb1470ffc88e01c8b617cded8af24b2dbce943a23ae4ab7275908f809b805773915e96c9788b1be71ccf9fd65cb07f SHA512 deb87ada7c10d6fd263f0a1261e31444c1034dcfd603ad3ef1287f1f5fb30c040953d64de5ba0a58ef7c7036b38923cfb4beb94518a25e5e363a6dc2bed87563
 EBUILD plr-8.4.1.ebuild 1706 BLAKE2B 9cf57201d0630c2f3f8934b2d64db8c01409cbf1001a0e3ce0949682e01280da700f4a9f14165e5c06fb369136f7cecff8c9b3f8f3465540893dc9f84ebba75c SHA512 45a3d957f45b2d71eff298b9f8931a495fcb6c7f48edf318d21f036a682d899d003fdaf56c4688395d716ce8a8f1eaf4554cfd124b96ac5221e75c7ae7095310
-MISC metadata.xml 399 BLAKE2B 3c3d305e53fbb1fae5ca9c97fe8d3e9b765bbd9db2e2fc79d392d889da65069487b867f73f69bbb10971fce543827947e3611e9052081558c33da7b4a66c29eb SHA512 213efff0d0d08b552143e20704f5f8506f94c8ccc67484c8048d95421f4b6ade9ff1a40d9db6bff6dffcab22abdff5003142948abe95bc5f19aae7e67d34056e
+MISC metadata.xml 398 BLAKE2B fbe9113ea3c7b36b9edf80a645a929aba4c1578ae347b6c3f952de32566fb038e2f8d66e116c209ed9132daff772ddf8609e2fee4d34daa82d7f491d712755d5 SHA512 0a3a915b23606e75f6bca1ce8088912022826dbe336f03b40a9a2988c7518d8c5a61b5c700f60d827465142dae9f2ee1f501a51209d1d3b9c891da1e1d3f847d
diff --git a/dev-db/plr/metadata.xml b/dev-db/plr/metadata.xml
index 60798fb9b769..7d7dd18a30cf 100644
--- a/dev-db/plr/metadata.xml
+++ b/dev-db/plr/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <maintainer type="project">
     <email>pgsql-bugs@gentoo.org</email>
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 0cf3c261b68c..ccc7c4fe4a4d 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -26,9 +26,9 @@ DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38
 DIST redis-6.0.12.tar.gz 2276349 BLAKE2B ab49b0278420c65fc995a90e850130971ccaf3df34a08a5cc10a8c211239eba8449b87fe67684189c71816cf259a70a23a77935ec61e8baa787daa61cb994201 SHA512 9dd8e3bed51e1356470e1bf08892f771744c0c9418ff874c16ea932ad1f471a908ffd8479efe1f32531d7f63cd7af5224273ce50f2fe7aa26c47716e0e78330b
 DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
 DIST redis-6.2.1.tar.gz 2438367 BLAKE2B 8717630771eafaf8a15dd371d46475f81f15bbcdc9a4fabd8f270ab6e09fbfb3ee2a1cddddb6c7778922d3552bcf5ee475eec7ba0623147ec36a5c5422cb0de0 SHA512 7c339cc360fc3125bb67c5748bb4fe940977faa937e3a86294829bde472479a811df8ea0ce4961d8128ec8d4ffba5d5a943c2957589c8da0cfc3f109f82e4af6
-EBUILD redis-5.0.12.ebuild 4732 BLAKE2B e1aa4db765f757fdcffbeb806975dc346879d09bbbe23eddcfa8deffe2a6f86b173d4d5fcd01ee2845f03318986e68fdba7793ff7561a98ab801cd7471898e03 SHA512 db0e89efafd5045e2c2efcdb0dd2902af4e4539e5f6cfe7206a681e3b9f9387e6a192cf5041ff6dde47b922e20b997957ef1aee46458a68c0d92acf916da146a
+EBUILD redis-5.0.12.ebuild 4729 BLAKE2B 1c5329e5d7e296f97fe5561b64b39ed85e83cc22cb5508016a2e966359140e9e946b72c4865435a6fee6dc5f350eb6a981afeda5aaef5b30318046280e1ccfa3 SHA512 a61756d60c828959e9986af99a169f19f6b3f607868836e15b79218527a9eef5601825bb176b1f87bf4cafab3150937213c6ca881e6dc4cd5a7caaf346b4f786
 EBUILD redis-5.0.9-r1.ebuild 4727 BLAKE2B 296ae8313437d189b96ee93f5b63cefe11abb576d4925e150de6db510183a948bae6a4ae76db1a393e8c1f3c0c17dfad8c52e07b8d1cf36cd88d11df4d2ac17d SHA512 af8a96dcccbc12d8dfb0c77d1c857b245c47d77b3084f11021e9cf02ce1a8258c3c09a855c209356c49ba9aa8a5ad37e732751d908e01e2314d7c2d5ceddf320
-EBUILD redis-6.0.12.ebuild 5020 BLAKE2B 097ff357543c0060d3684562bb58a018ac16e4a6800bcc5f1bfebdba842a45a5b9400bcaca36ef781d201d85814bd28025c4c53662dd67a14f1e6c4f7eff2aca SHA512 41fc1ee5d297d54bf62042851de411fbe5a6ec2846dd58d826eaceab191cddf4d35018542c0259d6330a5ab8d7b770aa2481997e634d28d7bd10771eead57eda
+EBUILD redis-6.0.12.ebuild 5017 BLAKE2B eb087b9eec1e14361140200dbfe6cb9388b32d06170434c50e40c17b237b91d7986b226f97cb4a823858a9f39913a4a8905cb729fe5cd27f84d594d85c545c63 SHA512 fcd2acef853696d40900cee136ed29b86614befd89555560f5bbe985dcdba5179b7ba9424c782ee81cfe22414bec600be53ba3d2f6f5b89234c4d923f5bd2b9d
 EBUILD redis-6.0.9-r100.ebuild 4569 BLAKE2B 255dc421757021cabf391366934eaac4eb3220df64e60742ccc7746e5923fe60bc90e7abb7180002c831017525ac3bf0dcc39d0bb8a4014a38894e68fb3bad18 SHA512 b3ce8c2c71d11f73a66b012adfef1aed5505e441814cb14cdc820a24d50cfc6f7dd57695d3bb5fa2f18037ca92113932daa22f97979c967a6f5fdf91bf630785
 EBUILD redis-6.2.1.ebuild 5020 BLAKE2B 9d64fc2efeb3b7a22ecbaf9440639b327f2555a21152f0cedb81cccbed351f1037e6158dbff9afa10e33c7ea59b575fce0f9c59e06576b1284e749f07a1472bd SHA512 c61f65441d30d13a939275bdebc0d27b7906eb6aa9de5dc675ba53662a5404d06f5bee04c4412a85daff711b5d31a739142e7e365e2fd19bd32aaaf66ebbbed5
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-5.0.12.ebuild b/dev-db/redis/redis-5.0.12.ebuild
index d9cb0a2b1f39..db7046eaf85a 100644
--- a/dev-db/redis/redis-5.0.12.ebuild
+++ b/dev-db/redis/redis-5.0.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/redis/redis-6.0.12.ebuild b/dev-db/redis/redis-6.0.12.ebuild
index 22268b85376b..ba48c5558daf 100644
--- a/dev-db/redis/redis-6.0.12.ebuild
+++ b/dev-db/redis/redis-6.0.12.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/sadisplay/Manifest b/dev-db/sadisplay/Manifest
index deebbeb79b35..9aef5b74b357 100644
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@@ -1,3 +1,3 @@
 DIST sadisplay-0.4.9.tar.gz 9536 BLAKE2B 0265eb470ab600b761cf6d0e1872c3225e863de8aa602fbcdb1839c33ced8825318d4e4f8ee24de420847c077d1830af069af37ea8d3e3e6c76f47dc2335e1b3 SHA512 30fe8dd2a6247328bc4d7640e5a34b15a062322729cb8a2ffb66c740145475a95ac924f752017fda8f347268ce598957cfe78e8fd6f80413267c72b143b3e8b8
 EBUILD sadisplay-0.4.9.ebuild 476 BLAKE2B 47175e13c1ef36529ea68f98b6b5b50e0a659233d3fbfa445b9b5d3e544c3792c0b005eb0df802839239613bbef283170791b1e9125ed1126e973dedfa64ad01 SHA512 32e5eb90291bbbe461111058f5fcaa185ba6ab004baf590687a152798f180c42a56e7c82e2177a95230bb255caf9ee7c7d45a45f7ad34c953c899dc5e1af7c64
-MISC metadata.xml 715 BLAKE2B eb0731795ba03939b3bb99859e1b461e515bec1763405c35cf2fe0c1fb749599527daa8731a4b18a9f18e0ec4f018a748f42acb87646fca63ea271d460dbea34 SHA512 47849ddbc16013c526be4754cddcda1dbae4be9d651431460e605b0873518fb3dcff2f5b2cccbba5e1ba29156598b67368aa51de3d1336294ffca54fb57810a0
+MISC metadata.xml 745 BLAKE2B 4b6c498625993d6143aa1eb6d67f30978247f4cf977f4af97fb4102b62933528a4c98cbad8dea04667601578e8038be0f494bc9d45194ad771428dd3c1c4d3c2 SHA512 e63776f5a01dd5a28f55e352ac909a514bb2b58e003f550be823687e63dfe9d810673d3cd33e69807cff7cb20cc04ca9cd5842ceca66a879c05b2e7614cde0ed
diff --git a/dev-db/sadisplay/metadata.xml b/dev-db/sadisplay/metadata.xml
index 9f00ca2c1e9d..4e12231e7088 100644
--- a/dev-db/sadisplay/metadata.xml
+++ b/dev-db/sadisplay/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index a0ec35034a68..dd3997fd5e28 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1,3 +1,3 @@
 DIST sqlcl-20.4.1.351.1718.zip 36694031 BLAKE2B e2c3548676223891afdf346ed5e9e3150557251e017cc6b13709f00998113a9fe44d20fa5e5969b7c4671c88b9daec77dc7f730437e1be71fd93f1f542a7c4d5 SHA512 14efb04f87da6b3e93edbc654164ee25fe8258bcc5ba91ff2e42e10d036e493e0e65c2e82795ba7ac93055af7d2d923e35573e63dbd3f22c2241bd3041c3e56d
 EBUILD sqlcl-bin-20.4.1.351.1718.ebuild 937 BLAKE2B e21df4f4713969555029c69f4af4a494e0c4cd85bc5465aec3f915064b8f7ad562e1d12936cae5cc4c80005611c1d7f5defcf474a745f5a18a87a2d30ca2218b SHA512 0cc3d5ae15deeb45635d23a89ff82fada8450e4327df6565bf10faf522e431a1c09931e9d5ef64deb3173ec63b50d5247236aed6a1c2e7eed53b3fb300764fcb
-MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8
+MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148
diff --git a/dev-db/sqlcl-bin/metadata.xml b/dev-db/sqlcl-bin/metadata.xml
index cc2aa77ecc42..a4f3061c46d6 100644
--- a/dev-db/sqlcl-bin/metadata.xml
+++ b/dev-db/sqlcl-bin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>fedeliallalinea@gmail.com</email>
 		<name>Marco Genasci</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 88bb57a7f379..6b3cb8a75d95 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -12,4 +12,4 @@ DIST sqlite-src-3330000.zip 12591089 BLAKE2B 14888bca229683e97c4666f8efb535be5bd
 DIST sqlite-src-3340000.zip 12623425 BLAKE2B 548293cf0166407727cd068804eb5e1ce62f654533c88a87b71a6ff62da37eb2af21b89b8d63ee677777ca917e0d685ddcf9b8d5c3c8b2a2b787d71da8e5a161 SHA512 520fbca59da02452e2861a140bde891aedfc8254eafaa6894e8d845369d60d6a921595a411efb2611c0f7b0cadd69a713dcdaaeaad1e4254e9fd9a6efde07f91
 EBUILD sqlite-3.33.0.ebuild 11438 BLAKE2B f0cc7f4987d1642d4b294e2c2d373e7da1cfa8db202fdef9ea66eb0347cf809eef5f09590114f6a75f8d1e3461ed689dfa8b6d574095c6113aee37c6c6500d77 SHA512 5ee535586943330b0cfc8e4108207c46964766fd59ae6a86bbc8afc6d4e5dcd820d60a75cbfe6715ed9908677f6f927adf185f9950953fa7eb242c3a611ba93b
 EBUILD sqlite-3.34.0.ebuild 13013 BLAKE2B fbd505c4299e99f26d7d81b5915b31b8297e1b33098df9bc247320d99b1ac974b8c9b265fe7631d264910ae924bc4864c87784e694673ed62a5859349885b22f SHA512 b69523d15df43fe906ddf53ebc0fababf0a57af3a8e4ad1aaf4d14d850168a25bd90cc493e4e2a38fcb911ea9b80d1e71fbc9adf1abe15f45950d820f64321ee
-MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
+MISC metadata.xml 743 BLAKE2B 4e2cdd6391c851ad8a705895fc9a5b5f8d77df3ae9cdd96310b1a72d5f4963d19427b8c97f5690f49262e91e9f321f6aafcdd5fee222eede0505810a803265cc SHA512 06315ac56dd1d0e738e3d1161b611c4db053de49e1a35e536b06b9ad7c0f9276b50c390ea6572802b58d49b84c7f1a3c8e63496d04d0f4b0d603bba804fb1757
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index c7b127a748ee..67b1888edcb0 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
-		<description>Proxy</description>
 	</maintainer>
 	<use>
 		<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 1515619e1b13..8d8652879853 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -4,4 +4,4 @@ DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004
 EBUILD sqlitebrowser-3.11.1-r1.ebuild 1420 BLAKE2B 2c7d13d4d011bd56cbfac596bd30dcb6d8c8252958be8a481dcacf59e1d16d2b1fb92f6b721a52506d685f51af193a42ce164340314c600f24430199fbdbf444 SHA512 3c9a8d829c49fcdf4f18c0ff2d48f9c4ce281110671101ac306edf1d60586759a6ae40cd0e05e244bfbb3bef6a86f1db6e7c6673fd1951ef665f34ee8fd1865e
 EBUILD sqlitebrowser-3.12.1.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 EBUILD sqlitebrowser-9999.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
-MISC metadata.xml 1477 BLAKE2B bd6a9d3483ae98cfe02d1d7cc0167d86e50935247063e63c428e92846e035c50757145957ed16ab5bbb979620121973e207f2d341f46cdc25bc2fdfae3dd89ba SHA512 6199dd425d9b960e403cd80155aaa6aa7f146f4dc1113e03969f5721880df426ddf082ae27cd5c0413b68a2a8d9f7385cda00008064ae7c56e9203f053df8063
+MISC metadata.xml 1506 BLAKE2B e52a311da6408b28b570e975745f05607d88a7b0fd2e6144ef008664ddaed062b67f355a141f61d926448829694907e2474d0d0b39088a7c7c8f8a509934d344 SHA512 a4ed70e46b0e86e266ce4a30f401517ab83dcef51fd048047e2dcd13b9c5cc7d9e985e69de5df73f670eaf969a86f835b65035e7093f9c195464dcb4ea09de7b
diff --git a/dev-db/sqlitebrowser/metadata.xml b/dev-db/sqlitebrowser/metadata.xml
index 92f71ab68770..ed00998feb6b 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>beatussum@protonmail.com</email>
 		<name>Mattéo Rossillol‑‑Laruelle</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index e2c312361256..ab5d3bf24462 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -3,4 +3,4 @@ AUX tora-3.2-qt-5.11.0.patch 1891 BLAKE2B 4617847e8ede3cbb25dfb3a5121f7664bf36bb
 DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a
 EBUILD tora-3.2-r1.ebuild 2371 BLAKE2B fc87422fdcb4ffa3b091e027b80be0869ed8eeaff6201c5bd3ed39cf21e26d76297aaa381854d73593c2c151d8b270fac171afeae0d6d5c77392987f9eba5751 SHA512 fe2dc980090dc7f1c52e00383659ee99c8dc8f8fae5616864ed7ca25ab2f298e0670ec01b5d3ad0ead4c4788c4241e9febd06ffe8c7007cb0de117d8637deea2
 EBUILD tora-9999.ebuild 2293 BLAKE2B cae70dd88725d3c007737c5ea97494fcac0df6cc7c37a1dd2f88449c45f5f336170d2bc64fb89ff643bd54a41139cf6297c93b8420cbfe75cae8c5b5a3670fbc SHA512 6f59d5b2438d0f22b6662a9dc3e9c82f039bc30e55f0e928ad4c1a21c16346f0abd873994693e0e4978b0a66daff1112022836b5289eaddc9045f61a3b6449f8
-MISC metadata.xml 843 BLAKE2B 483349f54edd1d61c459d689e4f4a65a427bfdc49a05244b8b9ef26f0d49460f3f04a995bca0e9e2becfb335cda699992bf62c4a1d26b264d5469741c01f9bf5 SHA512 fb6b7e2966d2cb74576f2558d44e64a5cf8aa79f78c5eeff58fcf433369b4efd32edb103ad4174bdd7d878466e4db720d81e4b1ff637d7c1193d37d944708247
+MISC metadata.xml 873 BLAKE2B dc914db9ecb278eb50579a2405be7ad2d3ae2f7e0d04ee57a2970c46b314c28ed76ee624533f0ed0315decf3d1ff763eb9810b1189b4771e5bd47531b5d58161 SHA512 0f9ea83b782109daaaddb1a15951f57c7c139a481815b19407a4869eeb3b5e49a188dec6ecd04b2bc57ae02c7a94fff04e2c6811ada19b74cf6f2402de0c60a1
diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml
index ac37be91b865..37466537bc7d 100644
--- a/dev-db/tora/metadata.xml
+++ b/dev-db/tora/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>ikonta@yandex.ru</email>
 		<name>Sergey Starikoff</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>haubi@gentoo.org</email>
 		<name>Michael Haubenwallner</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 5e5b1c7a72ff..c593828f0631 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,5 +1,3 @@
-DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
-EBUILD unixODBC-2.3.7.ebuild 1741 BLAKE2B 8b4e552a341fc6fc0cbde7f1a57c4ad4767c19f7e1b9aab7be8e86f2cd568e6599031877ad6fb567f04d173d61b031515ec2817625dcb07d68dd03618cc9e55e SHA512 f09723a448dc9c76c6ac2cf33261fb715334ffbff3c362ea0169ab9fbf938a313c624cbc6c4788700420df28f4e87eac769eb28342cf1400c70d59c5dd912d8a
 EBUILD unixODBC-2.3.9.ebuild 1770 BLAKE2B b4dd58f09389162bc9591ada594db3759aef4c2fbe6d0bdb77732d27b0cd86237b72c8cf30a6bbf7c125b1256e9e51693b0ffa9f672eefeec9408643120500b0 SHA512 20992b85a2db4608f88f4dbaaf2b07fc6adbe0ffe39f8e5ade705efd8c48839e0cdc54a1bc217cd231636a6f398b0a88c2d73ad677bac5cdbb901373d7ef143e
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/unixODBC-2.3.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
deleted file mode 100644
index 89073690e49b..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-multilib_src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--disable-static
-		--enable-iconv
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use odbcmanual ; then
-		# We could simply run "make install-html" if we'd not had
-		# out-of-source builds here.
-		docinto html
-		dodoc -r doc/.
-		find "${ED}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
-	fi
-
-	use prefix && dodoc README*
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-db/vsqlite++/Manifest b/dev-db/vsqlite++/Manifest
index 330148e0e754..cdfb98becc92 100644
--- a/dev-db/vsqlite++/Manifest
+++ b/dev-db/vsqlite++/Manifest
@@ -1,3 +1,3 @@
 DIST vsqlite++-0.3.13.tar.gz 28195 BLAKE2B bd66a1592d4044f6735b063b72e3ac12fce32ea67c1af92e435d9db475264ca4234021ea7c6b997cad03e296b0ff66e90cb781707b18ca4048e23f21b47d61ca SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e
-EBUILD vsqlite++-0.3.13-r1.ebuild 911 BLAKE2B 88226a1fe11c99e119b18d5ffe3971863ede877c8cdd279ab123d9abee6e68d8df0f52a2edf6ea4f1e979a5c829006b7d4ea51d72f2116a44ab62f403049eaa4 SHA512 5b7357ae383da99fb8b09e9f4579cd1a45f4c0504739b75be7c77b49fb77b394fafbace6f683e3c25ff4b58ece8f8ec607876bd487856429bdb1c2c25b9556f5
+EBUILD vsqlite++-0.3.13-r1.ebuild 816 BLAKE2B e39b8df3184573e1e780d78efd740b89faeb600e860d4b380e96dc61ea92609cc588add88b827f0f2a8a415aefb48418f2e72d1609b62d059d6fe1c5ce1f23d6 SHA512 4ea875cdbe92ad0c206b3128976e98ec1296bdcf51fdd44407a1a5a6391a992def159bf2491e2a7d1023a2df75ec12c251bdd37cc86e611f0a035ec23800446d
 MISC metadata.xml 307 BLAKE2B dded10764ef95d964bc1d0685a8d54daa17d56eab31a36121b6b0a47937f8e59f199cb4a74ee1e1d7b457749b870db08e6ce15efb435f8850cbedc775dd463a8 SHA512 9c6a1b9a9d1ad7b9c5e8235145bfda70198cab067695215ac9a1844f8e292338c136abf1ba68e28d82de3d2f2884ee47ec4401355cece233534c73a3451476fe
diff --git a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
index 0024ad1032b1..803330278e26 100644
--- a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
+++ b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
@@ -1,39 +1,40 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
-DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++"
+DESCRIPTION="VSQLite++ - A well designed and portable SQLite3 Wrapper for C++"
 HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/"
 SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="static-libs"
+# package name is vsqlite++, but github / homepage name is vsqlite--
+S="${WORKDIR}/vsqlite---${PV}"
 
 LICENSE="BSD"
-
 SLOT="0"
-
 KEYWORDS="amd64 ppc x86"
 
-DEPEND=">=dev-libs/boost-1.33.1"
-
-RDEPEND="${DEPEND}
-		dev-db/sqlite:3"
-
-DOCS=(AUTHORS COPYING ChangeLog INSTALL NEWS README.md TODO VERSION)
-
-# package name is vsqlite++, but github / homepage name is vsqlite--
-S="${WORKDIR}/vsqlite---${PV}"
+RDEPEND="dev-db/sqlite:3"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
 
 src_prepare() {
+	default
 	## remove O3 in AM_CXXFLAGS
 	sed -i -e 's/-O3//' Makefile.am || die
-	autotools-utils_src_prepare
+
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
+}
+
+src_install() {
+	default
+	dodoc VERSION
+
+	find "${ED}" -name '*.la' -delete || die
 }