gentoo resync : 12.07.2021

17 files changed, 69 insertions, 23 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 24fb173849d2..4de79dec386a 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 49be48a19bb8..ff3164206530 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -9,5 +9,5 @@ AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.3-r3.ebuild 2034 BLAKE2B 3251a923a06b6cb7635375a0576d57156a6ccac7b1d82a02d511e563b7623621c327ae406ecea799f77bd2e71810300ecc85310c0583a4f457658b21e8d8cc6f SHA512 3071236bb2fb9024e0ce873ca14ce3d7fde91cb82fb5f0bb4012d4fac47eb713a7bbfbfc26235c6921493d15f66443b3d1be93792ba14f0748f7f5cfeb46d068
+EBUILD mysql-init-scripts-2.3-r3.ebuild 2041 BLAKE2B f651338cbf0aa8bc557ef31e5800c14b74d11fc2828923c76d3befa364ab8e81f9f153d1fe566189f7ee70e554f21e071a41e2a0c0eb266fb98ff54a11c414c4 SHA512 0d3f588195d564a14c74e72dc3d916da084da43a84fc9b5f0b3a571b33ca7067dca738992e927e7a7db0f24e304b3efbdd60dcd588e485da430fbb45741c7134
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index b7b6b0554b9b..17ede9b10e24 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.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
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-db/percona-xtrabackup-bin/Manifest b/dev-db/percona-xtrabackup-bin/Manifest
index 5abf36573016..921bf44c1abd 100644
--- a/dev-db/percona-xtrabackup-bin/Manifest
+++ b/dev-db/percona-xtrabackup-bin/Manifest
@@ -1,4 +1,4 @@
 DIST percona-xtrabackup-2.4.13-Linux-i686.libgcrypt20.tar.gz 85192746 BLAKE2B 7df4fee162587830a19499cd692d5e81ba67bb445ad0bea7bb93a9857bae5e4671740d01b817b6d04043abfd436ef88e0983dc7ab80d5d20426d9c05b470c79e SHA512 c2fa43aa4654cfcf06aa47ee20ee48e9b725aa3b0514419c5af5872d7ed37a971d5afe5aa4dc9475cf4d0738354a0ec35e6dd97a24ec00b2330465e94bafb365
 DIST percona-xtrabackup-2.4.13-Linux-x86_64.libgcrypt20.tar.gz 87985226 BLAKE2B 937518b96d948098f2026397947250fbe4952752cf6f83fee5fdda4031564916bbfa07cd77a5db5db16150d446593b52fd82d6ee919ceb9fb0fb41de2f6ca631 SHA512 824ad9e94c38d51291afa1c9f1b9114c88c2b777ac9e5eb41a523463355521233b682920940084f8771820ccad6bd2a9ca280f6397eebd99ca26995712e68007
-EBUILD percona-xtrabackup-bin-2.4.13.ebuild 1555 BLAKE2B c912f2732191d8036ab4b02190ad39f44c344e68879984155d24a58358377539194b2786ba09e08f78af8bedbdc83f2963c6484b82c1eaae01091a68ee52e96a SHA512 ca9acf57354277fc17f22b8b96d37310d9e7b2981bbdf79051e1da23e2ba4bccdbd80f86e7ebc265fc31bf76fc440e44f2fa4a9a2746fcc0439d829b79433401
+EBUILD percona-xtrabackup-bin-2.4.13-r1.ebuild 1620 BLAKE2B ef323a0a0a7bc5a0a3f953ddcccf80be36c71ddf9d115c1ff3bab28afcb488a38422758242e691178585f3fc3e96798678ba804b946cb7c483fcabf5be6e9630 SHA512 6c0b0d95de6d5a38ff2b04c619645defe1ff6e23341380d837dc20f9b1e27cd103d92cbcf4fa0b1c17dbe6753c9f2c90c156ee819bb41ffe0e5eef06bf007b33
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
index 791c5b01275b..69f1ac6bae71 100644
--- a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13.ebuild
+++ b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -29,6 +29,10 @@ RDEPEND="dev-libs/libaio
 	dev-perl/DBD-mysql
 	sys-libs/zlib
 	sys-process/numactl
+	|| (
+		sys-libs/glibc[crypt(+)]
+		sys-libs/libxcrypt[compat]
+	)
 	!dev-db/percona-xtrabackup"
 
 QA_PREBUILT="usr/bin/*"
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index ad17176371f5..394d60ecf296 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -5,5 +5,5 @@ DIST pgbadger-11.5.tar.gz 2305597 BLAKE2B 1e88e52ac5861343e7122784f3ec1ecc38e67a
 EBUILD pgbadger-11.0.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4edbc4e7ed251421c8962223e8357955da642b525b5dea3fa6ae498c46232502a628df04373b28b52b7da6f8f SHA512 f1140736e8be887d864e7579e0da07b5f4f774ad4ed8bb7993c29173ff87735f02e168be4a1d955cfed9dad795b051f5d65eb773b856c35e613096ce26cc2fce
 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
+EBUILD pgbadger-11.5.ebuild 454 BLAKE2B e758852aa256bdd32045183aa86c7343d86dcbf31d7485187fc44787baaddb4938e65afba74bf4c8baec01c0beee888253ec7c6b8c283549bba03706f4105dac SHA512 26be2dccf3a75ae34647f5fdb331e244729a6255fca52f0a151f93b1cc4171f0d7399334988910caa2c7acf11c012c4fae38eea4ea30007d2fef3a0e027913c8
 MISC metadata.xml 413 BLAKE2B 15cb832ee856b856530026c2541f520feb59b15d345c66d9851168df6502c0e9b596d1d6c9412af66dca9570302a6033e43aed906b8950fd9f3b300684b32285 SHA512 3ac9450fc26e5e683c219e638cce3caf09f4a348926a5c863f7d3951988a363920349c29b00b6791e7d414439971242866f7d2d2901a26014f2e17b0e83bf791
diff --git a/dev-db/pgbadger/pgbadger-11.5.ebuild b/dev-db/pgbadger/pgbadger-11.5.ebuild
index de9d41cb53e9..79dbc731d240 100644
--- a/dev-db/pgbadger/pgbadger-11.5.ebuild
+++ b/dev-db/pgbadger/pgbadger-11.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 		dev-perl/JSON-XS
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index cf23f5abe2a0..f87e3ee54653 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -6,7 +6,7 @@ AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf8641
 AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53
 DIST pgpool-II-4.2.1.tar.gz 4713114 BLAKE2B 207cb3c43e47d40385d6808195561117293e5acec6bc34664ec7a1d8754bf9beb8c5350252a4274d4c50520254089f0e5a5fdfc0faf778186fa8000db6124df2 SHA512 b859a3952f69dd98a3df60b33b801d3bc96b9a11757593795a89751abe558c6baab10a37701d69d415c9da26a16abcdc72e0209e74c62204facfb25cdbc512f8
 DIST pgpool-II-4.2.2.tar.gz 4734840 BLAKE2B 2b4d26991732293e1411d1219f85a8c9ad1dca72c63069381ae1377a02ae215e813356172f3b89b42b9140549c92c76d443b125bb65cbc6abf03d2b99cf18dab SHA512 a147c810cc691fb27b823a813cbd2eaad66822c7c9f5c0f829cc70d4ac65911bbe827640f2dbd8060913276ed97340b52167e4332e9cdf013b6c9bc144c7b5d8
-EBUILD pgpool2-4.2.1.ebuild 2355 BLAKE2B 5a7a4d222ef64748503dcee59c63a619358b044041c04273df4e86f1e03bbb5ba9c1c1f1ebdd469d7d6d42ce056c9fd7fb5909b33841953cae910017f938fe83 SHA512 66402ca2ee7c444946ffc4f546203d071a388614c39788d721b92582d041414f9d44d584e4e56e8730ef5301dd25118c606c5c2a811d870e2ba9e1e6525ab4d3
-EBUILD pgpool2-4.2.2.ebuild 2357 BLAKE2B 6e776a5e5187d384f737c55d2ee442f627fe87a36d6e03cf72ff457f5199f5a2351ddd042c819f1509008fc2bd2aa92dbb94b06fec8f024a9f6da5f9052e8692 SHA512 93ca323b8cb074bd783a89b78e0b8aa392946827169ddc504aa2d19a169ca3b3a0224a11c539fac1858652919ca6dd0d35b5fa4a1c3b435bef684c3cd2f4b847
-EBUILD pgpool2-9999.ebuild 2432 BLAKE2B ac4fc825ba2ffbff373a6afba923ddc13871caeab4376d4ac82bf8a7faebb10ffe09b313f3ae09bc6c4752cfa263c8e692d9bae616ec3ab5ce87cb8c6a8a35f3 SHA512 43088bf9bfa2f837879d7343618c16e7ce38ff669ffb182ea9a4d31615146a68994526d0559173202f5a67e7e313a747d464a2d8e9fde2c28f0423eb8fafe1bc
+EBUILD pgpool2-4.2.1-r1.ebuild 2375 BLAKE2B 90f7c1915abd39cd3ea8513f5f58bd73d6863547f0d8c9a719fbea7118210fe36f495f616a11bcd834b6caf5107aff6c7a5bf148a56c4652f993a2e32349116a SHA512 11f845b16205823a699d42f466fe06e6ff37296c71d65700a6218ddc663970a6f0767460dd7110ab6fc93968765d944ee39f9f7a4105e9dcfec8ec1428ac7c20
+EBUILD pgpool2-4.2.2-r1.ebuild 2377 BLAKE2B 54f4007d8e85512712c0d3ab1feb27eb25e06b8114962807df2a7fa2c9267b2dbc1b5e3d0a5d63f4525ec9fa31582319b8f19e58a7de8f765d545625054bf061 SHA512 5cf13f06e125b7da665666b5026a0a0086b7a211ec3c929cda3ad764b01b4052b443816b99bdcb1b4c92e8ecd87d590e6001ac3ac9676a770df2fe50e0cf2284
+EBUILD pgpool2-9999.ebuild 2452 BLAKE2B 3e2e76114c91947e42572c175f74097feac002b4c52901c7a97d100977acaa14abe4212a7fb873ab931f7c01490db52a4ad24def0ed1bf032bf3b20b8b986759 SHA512 1ec644d51b49fc732f39f49ae9dc5bde1ae32fc122f019ae97075b2c9d629a2032253b94e730d5bba1f1aabadc745d91c3abf8b50074c5492f362a9d07db8e05
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-4.2.1.ebuild b/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
index 08a1225b8084..68b7ecabf291 100644
--- a/dev-db/pgpool2/pgpool2-4.2.1.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.1-r1.ebuild
@@ -22,6 +22,7 @@ IUSE="doc memcached pam ssl static-libs"
 RDEPEND="
 	${POSTGRES_DEP}
 	net-libs/libnsl:0=
+	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
diff --git a/dev-db/pgpool2/pgpool2-4.2.2.ebuild b/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
index aa370a2e02b1..af575e001949 100644
--- a/dev-db/pgpool2/pgpool2-4.2.2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.2.2-r1.ebuild
@@ -22,6 +22,7 @@ IUSE="doc memcached pam ssl static-libs"
 RDEPEND="
 	${POSTGRES_DEP}
 	net-libs/libnsl:0=
+	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 46ab01e9e550..eab9b3bd7651 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -22,6 +22,7 @@ IUSE="doc memcached pam ssl static-libs"
 RDEPEND="
 	${POSTGRES_DEP}
 	net-libs/libnsl:0=
+	virtual/libcrypt:=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 98a3d338dfae..8d04640cd8ce 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -22,9 +22,9 @@ DIST postgresql-9.6.22.tar.bz2 19003741 BLAKE2B adff6e81ec4b289bd5c51fa44adb38d7
 EBUILD postgresql-10.17.ebuild 13643 BLAKE2B 06e48fa619942bbf5c9e83202988f410939bb67f08ae29b96508551103a335ad1667fad29e90144e27e0544bde1a408b64e6ef967b479fb72660a7dbd6f6aa29 SHA512 6ddfdb2b1822e1096980093432791ece0138703f6ba102f703bc1f969c5193ae312462b45f5cd0f08deeb92c4ef6d149574733ba8fa63dfe6cdf191d76285d19
 EBUILD postgresql-11.12.ebuild 13593 BLAKE2B 9d4eaf3b84f0b5317fce6a35489a376a2e0ccd24d8096970bf24438b33dc1c0aaca22b032d5255b008b44950fdff7b5bed46e1a105e12c1c0502cd2da17a6780 SHA512 4fed5ba0d16e373c19f52a1ab8e3a8fa6cc24590f6ac914e4930dd1ed7cca1048449ad572f92a816b35f7455071dca717c480c14a334763f7cdf1a0ed1139bab
 EBUILD postgresql-12.7.ebuild 13565 BLAKE2B b4a8005b07b3cf5844bb46635216539d6740bffacdfed3512e10c44dc63099411d402e54f3e11732c96181381cd84e386ba700ad63800a1795a443e9e13e4261 SHA512 e557e572f9282bedde4f334c66f4f58b0fe83e8e2c5a57605037893eac904c617a6481469c5eab3ea684b4d3f4823ec28d46d6e5a6077f40cb9a1174aafc1df3
-EBUILD postgresql-13.3.ebuild 13811 BLAKE2B 7dc563ac1eb47463bb0ed5541d7f7c70868a3b515e99920370036efc8a5e883a23b17933f42dadc12b88fe926fce880d957c40b75f656ea0f21fdbecf62b74b1 SHA512 ae056236c7396fb17ed94ff52ab2296fcb4bf564ec007abf473d50bde262e66e9d09edcbcb4d06305ebd219133548e102705a2323733d07a7ebeaa75c3f68d7f
-EBUILD postgresql-14_beta2.ebuild 13688 BLAKE2B cd00d46f584c96b372c4e69f217e3e8d898b2c4ed18b2db356766901d956567f23fd503d6db54900b8f0c7e22913e2f7d22cd3f44e020bc578cf61710b65205f SHA512 ff785689130269692a0a12adbea5a1fbc63f6f26d43641cac4a4726d819181a755feaa46139da6a17a7fd94a9babed216cd06c01d127c83670193d85ec3e650a
+EBUILD postgresql-13.3.ebuild 13960 BLAKE2B 87f1ce94709b84bb3aad8453202bff71b8b12a840432b4fdbf5a5428d2f26cde45ccc848322e28151386c40d22847a20b7209947974ead5d5b214aae533285b3 SHA512 793c3715bfb970b295da084075fa5dbf9b417766ee4f00ce872c3840468755101b942fd8a70046d4d54df464d382c1ddb47974afdce53171d5fbad5d423f6ccb
+EBUILD postgresql-14_beta2.ebuild 13830 BLAKE2B 52800e0af8bb24919d5f21ea065d4d4171b6ec12167dbbcf7ce7b4ee7b0b482cfb863956172cf39ea51a8ae6fa9d5ce9b27fca5a1844bc8d016d37cdb9e71d06 SHA512 a7d1150f5e673f1c8703fc112ccff0bbd155d3b79858b38cfc116f51cb88f0de2a3a347015fe92d8a43abddcd3cf041d984ba53149cad9d261130a3c4af09631
 EBUILD postgresql-9.5.25.ebuild 14291 BLAKE2B ef54a42706bc54622d43ace0d706c3fa483222e5ec861eb049eb13923ee88d344348c8398368b423d48157499d6cc9155d2f998f95e1a20d2aa7e0d956c76973 SHA512 2f17849ccc88f02cb0cb8b9e170b1b5df0878b495947322129e1be8374b34edfeace8ba278387f330068f282c43fa145c685b2075f8ca1a9e544fd0ce1803b9c
 EBUILD postgresql-9.6.22.ebuild 14514 BLAKE2B d541ed3a385106c4ece340c3e6f59ec20aebab37c6dd2714955100ad381561cc29b51e32238a0eaeafc333b951965e4226913914b28d1390a5309a53db407c74 SHA512 bb62fd48fdb4d960694585f668f06b0c55ce97123ebeeb04b68c8a33befe092c7a7abfc1e12e6f0c519786f1dda4ae78c7cfb1b2e640ce839b4b1cbab2d57ba0
-EBUILD postgresql-9999.ebuild 14035 BLAKE2B edb2b8a8558adfb5eee5f28c34a2e4520283a69959302d584ae4d21fa21a03b87cdeb1ec033d3e4dd6c5f7ed47fab1020d23a249479c5353e4ed8dacf316ee0b SHA512 caa32cf295a267d04474194a7d9ac3eec287b3b63d91361afa129d5af90b7d958e31ebf0af9aab7ab6d4729aba202ebeb4a827bdf8f1b434429191c7e115465d
+EBUILD postgresql-9999.ebuild 14177 BLAKE2B 78b9c2382fe99bcbd76183c729d47977bd042ee11b4a04df6708c99d30b37eec3aa3d8d9324df1fa29cd1d82b90e8522e3d55e2396f09f0a63b69c9c1bd60131 SHA512 821d3b47016f4adcff0df8a33dd2dd97f710b503925bb256f16fa09d206c1a9a1882c5c4f3998db89b897fb516924528aafc94d20eccf8622221a6544d23c63d
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/postgresql-13.3.ebuild b/dev-db/postgresql/postgresql-13.3.ebuild
index d71750a1cb74..85d7618669ca 100644
--- a/dev-db/postgresql/postgresql-13.3.ebuild
+++ b/dev-db/postgresql/postgresql-13.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~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"
 
 SLOT=$(ver_cut 1)
 
@@ -134,14 +134,13 @@ src_configure() {
 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
 	fi
 
-	econf \
+	local myconf="\
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
 		$(use_enable debug) \
 		$(use_enable threads thread-safety) \
 		$(use_with icu) \
@@ -159,7 +158,14 @@ src_configure() {
 		$(use_with xml libxml) \
 		$(use_with xml libxslt) \
 		$(use_with zlib) \
-		$(use_enable nls)
+		$(use_enable nls)"
+	if use alpha || use riscv; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
 }
 
 src_compile() {
diff --git a/dev-db/postgresql/postgresql-14_beta2.ebuild b/dev-db/postgresql/postgresql-14_beta2.ebuild
index a9630c760e88..e6463312ebcb 100644
--- a/dev-db/postgresql/postgresql-14_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-14_beta2.ebuild
@@ -135,14 +135,13 @@ src_configure() {
 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
 	fi
 
-	econf \
+	local myconf="\
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
 		$(use_enable debug) \
 		$(use_enable threads thread-safety) \
 		$(use_with icu) \
@@ -161,7 +160,14 @@ src_configure() {
 		$(use_with xml libxml) \
 		$(use_with xml libxslt) \
 		$(use_with zlib) \
-		$(use_enable nls)
+		$(use_enable nls)"
+	if use alpha || use riscv; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
 }
 
 src_compile() {
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 106cb9fb88fe..8bdc4467a149 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -151,14 +151,13 @@ src_configure() {
 		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
 	fi
 
-	econf \
+	local myconf="\
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
 		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
 		$(use_enable debug) \
 		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
@@ -177,7 +176,14 @@ src_configure() {
 		$(use_with xml libxslt) \
 		$(use_with zlib) \
 		$(use_with systemd) \
-		${uuid_config}
+		${uuid_config}"
+	if use alpha || use riscv; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
 }
 
 src_compile() {
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index f69c06c0254d..de07dcf56689 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,5 +1,7 @@
 DIST pspg-3.1.5.tar.gz 1380515 BLAKE2B b9539347d1977a178468127df5f92f8b7be835b7e6edc49720131173b71b22e01b614bcde55e354d32a2ecf1665dcebd27502110786b7595411b5ec782391f01 SHA512 287d4794aebc867bf3c344c3747f1d058c1b93710dd0d86de66ae1e0d97961f4e3d511bc0f7df98c309bffc962aaf50b758faab1f8c6f0eb3374450e53ecdccb
 DIST pspg-4.3.0.tar.gz 1398789 BLAKE2B 51669105e335669ad76f174f7e085954bb5bf65719c929b0153aaa53c1a48d3f6c642cdf20624042dcfe5d7ad43bf2e6c5b5aaa5263d100590fdfa8ae21e62f4 SHA512 947052ca480ff271712b4620d7cf6060a5a702f245417c5223d8dcd6a357f71d16bc5bc732f883e80c730d3b699534a5791fc58d37b6c05e40e71e8f814e2c23
+DIST pspg-5.0.5.tar.gz 1828909 BLAKE2B 9e58735acbeeb42b7aa560d0b418b40ab461e1be2a429696cc07414d7e47e58c12511e6493ab95d16dd1b02b37921aac98acd99c9346dea8a95c55545a4c755f SHA512 9e2a673d7721598b0058ca8738e973b4c6b2e967b6b6d6dffba6d6473760809dce01b0f086ff6fff4e16e10a4fe78f0551e0a42d78a66513eb898c2df7dc0dc8
 EBUILD pspg-3.1.5-r1.ebuild 432 BLAKE2B fc486094f381b85cc81e56cb6f426d4fb355b24baf49a5a6319b7299e1f0d2083da07ad83e39c439e12b2018fbd5690237b300059dc48dcf05616966cb23142b SHA512 b99c9c778657f441ea545b9a128c4a9141bdcd4ebc6f40d0397027a6050e64a35c1a81370966f94731ec8f4876aa7c123379a7d39180f6662475864bcfb49e3e
 EBUILD pspg-4.3.0-r1.ebuild 434 BLAKE2B 6d2b9870c9f058968ef4ccb8acbad5cb92f0825251a62efea26c394f4e9fbec97f336be8ee42d44d5bac77fd75c23b07e15108cb2aff3cec29056eb567e882a3 SHA512 6351530e4b5c94270b6e2a86d6f3886e3e7974f5fec04512bd6df19d7649266f8c7ac53298e320a073bee3746c5f3d1d3573a296db0cb6d882a289dc4f2fcc0a
+EBUILD pspg-5.0.5.ebuild 434 BLAKE2B f18c2ad33544ce0989454d065bda67dec7c1bab03bbb3f703da5bdaf84a96847607e3d10e5e7f0b0480b28f2beabbb322fdaccf470b161bdb929dafcc6fd1afb SHA512 d75cd39a0b5f6904c0244fd9aa2c32f6aab901aa0a023e542a3c7d75c0ef1968da3d5418395b93bc636aeb1eeb44e97b13213835df7bc8b113a358b65d070815
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-5.0.5.ebuild b/dev-db/pspg/pspg-5.0.5.ebuild
new file mode 100644
index 000000000000..d793b9350dbf
--- /dev/null
+++ b/dev-db/pspg/pspg-5.0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/pspg"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:=
+dev-db/postgresql:=
+sys-libs/readline:="
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"