gentoo resync : 12.07.2021

4 files changed, 31 insertions, 13 deletions

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() {