commit:     2b06a061158e2a7fd54ac8afa15e79ad654301de
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 07:41:48 2023 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 07:42:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b06a061

dev-db/postgresql: Bump

Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-db/postgresql/Manifest                         |  7 ++++-
 ...sql-16_beta2.ebuild => postgresql-11.21.ebuild} | 32 ++++++----------------
 ...sql-16_beta2.ebuild => postgresql-12.16.ebuild} | 30 ++++++--------------
 ...sql-16_beta2.ebuild => postgresql-13.12.ebuild} | 14 ++++------
 ...esql-16_beta2.ebuild => postgresql-14.9.ebuild} | 14 ++++------
 ...esql-16_beta2.ebuild => postgresql-15.4.ebuild} |  4 +--
 ...-16_beta2.ebuild => postgresql-16_beta3.ebuild} |  0
 7 files changed, 37 insertions(+), 64 deletions(-)

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 8b486355d64c..70a568060bff 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,11 @@
 DIST postgresql-11.20.tar.bz2 20456483 BLAKE2B 
9f14b39486e17ed7f602c11b350b24c295231e9540353a75579b87ddec1c72232c61f39bd8bd3e733e063d149fdb77f83d5dc494f669428f3832485acdd4574f
 SHA512 
f8582c0dbd1fd08aa2ab3da60fb95d123a1a2d0f7558170557a52f077cb89d31b857360c57899b2da91c2182e32973c7aeb3ed0c018606070a52a9dfa6580320
+DIST postgresql-11.21.tar.bz2 20467892 BLAKE2B 
a20440904a6908ee1a91bf5c300b15abd2135de01300f2910abe573ba1c52aa6195c81497326c8f1edd5f1b21a993a911a9e78900720ee10e0b311455143c63e
 SHA512 
2c76859b50ac9c6373624e5ca25a94bbb2a3b6af014304508969f2ae21760b072826c393822b33de50ab9dbb84cd5168b9f5e7d8e057a1d573223180934d7899
 DIST postgresql-12.15.tar.bz2 21127306 BLAKE2B 
2d5f36323488f2d5b909e9404f3a4b6938b5c8a1f29f8d8eccef68c6b6e5cb79079a9c7e9fb86818c42d8cc7f6f34ca2f937ffae0f6ca79b770b0a2cfa025bc7
 SHA512 
9c6765ec75948e19331180b74bd34a214a91cf6c764ec7baffb115e490584a07e0157aa56f425f49d508cd2a7a724a092d1bad6fb6b16749a48a12081202fc3e
+DIST postgresql-12.16.tar.bz2 21140532 BLAKE2B 
25370615532f1b23765f7b9973fa85b9801fca575182aded4cfa682d170b4b17e92353bba441ab7c7051e9a916a564d5912041149fb287bf33c4472359fc901b
 SHA512 
37c1e5c87e6e3437b9f3de1219a8df2085b1dfb6f687980dd0e9c8691f2caac34ac58a6c119fe69a61888b80a9cbce89ebc9dbb345d6d141a8e4ea9b1b37fa89
 DIST postgresql-13.11.tar.bz2 21519655 BLAKE2B 
0f758eb560190beb325ad429ead0d8ed134918751ce48829c04b88cc0ff32612f4dbfc75d631849fc152733211ddca7649209a2a874190e6cdc1c0ec7bb02ff7
 SHA512 
30c60de44f9a33470ea9cd0c9757de23341bf1f5b9f3e8ee2c5b303d6709d08e9aea0f6ae597e344f610a577809860c7921596fe63034b6c2e3fa488e3040987
+DIST postgresql-13.12.tar.bz2 21542293 BLAKE2B 
b0de1300d90f41445b941c22716986534df850754f67b81c99da9d4acc18b8e8dde4a7291d7f49960f4480a2d9755137390700bf20447d78f0432b526aeb70d7
 SHA512 
6b6f6de998016b33f0954d4ed8233b84d98abd2dc9b50f5e959f403d1d87a7e9c3b8c8c2ed456806578c2610982f41be3169d9afd4221c52c320b1a2795043e4
 DIST postgresql-14.8.tar.bz2 22204905 BLAKE2B 
a9e5a94dd4cbdc267601ac4d6a9d730e28f7d8dec66edb3c623d797bd7636d2464e851719d9cd92cc0917532d355477e7cef6c30f8b07fb8053ca60369492961
 SHA512 
68f53702e9bf12ea6648e30ede21da94b1d50a5e4dbedb4180b7758b164cfb68414d5f0a1e74a78a32e7b385fb6d8cc18affc902ad7d7d77d4eb3318fa2f7d46
+DIST postgresql-14.9.tar.bz2 22207374 BLAKE2B 
51c2e6205092873369ca68e2502cfccb1de7d6e8275ebd02dd58d8ed6133aaab9eacc21f8057b7e6555df4207b7af51f43c84b5e6e22eaa9c494e4eceb806fbb
 SHA512 
8a7f74c5fd1ec5339085f357b3044dd0d763e3368bd42b5d68497eba5cbf71e9c76a329580d8aa3145aa98a157f28df548c4a6dc2d880db5c0156baa231f5d24
 DIST postgresql-15.3.tar.bz2 22819107 BLAKE2B 
4d2e79a9cb21faf47be963e31b1a8ccc9ae205b5836dfbf8ea426229a31dc63f40cd0280108abfa0553affe692c42137f7ad4e3bd1d269298689fee82c5dbb89
 SHA512 
cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6
-DIST postgresql-16beta2.tar.bz2 24300580 BLAKE2B 
983c9cb92d53361ce4da471537e72cb458713267e2907da28759904266880e163c9ecf23a9a4e696fac09630935f5f320faa413a1e35d32a8160924e9b1f87dc
 SHA512 
b57ec7f4a6d36331d3faaf168aaad191ccea18ef2506f97045412de111f52b78867d7d7d0884583e87d522adbcf39dd24eb1baa3a899d5a3f7481f75ac18912b
+DIST postgresql-15.4.tar.bz2 22850355 BLAKE2B 
e17c62c4e3f048f28073c1706bfa1d3eb065c1416117061fd07b325072c19348f8f2badea1364a054aebccf6d65c2ca21bb46d9cf621d78bd0a75f5dc4b21fe5
 SHA512 
37dd3e8b644d10c4f55963e07344ff4b0079adbae60052306f230f15e4ef4662b89e84a63dacc87cbf926c80b186d064a391283dd16e29ab47f7acc8a9860d0b
+DIST postgresql-16beta3.tar.bz2 24313365 BLAKE2B 
b6ea434f5da91452e77272fc6ebdff54fde3a99dbcd5cfb0cf66646a78fb4331e53958531515657df2dda54b1be5b344c54cade380b6f64eea4235fd574aa990
 SHA512 
63ec108aa9e90f96841f50082c66c40e12bfaa7def338eab1d190159b0770378cd4f8ba48570ba4a254fc7eb9dfb745a29522bd78be3c155367735b3789bbd06

diff --git a/dev-db/postgresql/postgresql-16_beta2.ebuild 
b/dev-db/postgresql/postgresql-11.21.ebuild
similarity index 94%
copy from dev-db/postgresql/postgresql-16_beta2.ebuild
copy to dev-db/postgresql/postgresql-11.21.ebuild
index 5571a39f0fdf..59df56850867 100644
--- a/dev-db/postgresql/postgresql-16_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-11.21.ebuild
@@ -8,7 +8,7 @@ LLVM_MAX_SLOT=15
 
 inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
 
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
@@ -21,9 +21,9 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/";
 
-IUSE="debug doc +icu kerberos ldap llvm lz4 nls pam
+IUSE="debug doc icu kerberos ldap llvm nls pam
          perl python +readline selinux +server systemd ssl static-libs tcl
-         threads uuid xml zlib zstd"
+         threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,7 +40,6 @@ llvm? (
        <sys-devel/llvm-16:=
        <sys-devel/clang-16:=
 )
-lz4? ( app-arch/lz4 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
@@ -50,7 +49,6 @@ ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
-zstd? ( app-arch/zstd )
 "
 
 # uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
@@ -103,7 +101,7 @@ src_prepare() {
        # hardened and non-hardened environments. (Bug #528786)
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
-       use server || eapply "${FILESDIR}/${PN}-15_beta3-no-server.patch"
+       use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
@@ -134,20 +132,20 @@ src_configure() {
                [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
        fi
 
-       local myconf="\
+       econf \
                --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) \
                $(use_with kerberos gssapi) \
                $(use_with ldap) \
                $(use_with llvm) \
-               $(use_with lz4) \
                $(use_with pam) \
                $(use_with perl) \
                $(use_with python) \
@@ -159,15 +157,7 @@ src_configure() {
                $(use_with xml libxml) \
                $(use_with xml libxslt) \
                $(use_with zlib) \
-               $(use_with zstd) \
-               $(use_enable nls)"
-       if use alpha; then
-               myconf+=" --disable-spinlocks"
-       else
-               # Should be the default but just in case
-               myconf+=" --enable-spinlocks"
-       fi
-       econf ${myconf}
+               $(use_enable nls)
 }
 
 src_compile() {
@@ -179,7 +169,7 @@ src_install() {
        emake DESTDIR="${D}" install
        emake DESTDIR="${D}" install -C contrib
 
-       dodoc README HISTORY
+       dodoc README HISTORY doc/{TODO,bug.template}
 
        # man pages are already built, but if we have the target make them,
        # they'll be generated from source before being installed so we
@@ -448,12 +438,8 @@ pkg_config() {
 
 src_test() {
        if use server && [[ ${UID} -ne 0 ]] ; then
-               # Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the 
same. We set
-               # LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by 
Portage.
-               local old_ctype=${LC_CTYPE}
-               export LC_CTYPE=${LC_COLLATE}
                emake check
-               export LC_CTYPE=${old_ctype}
+
                einfo "If you think other tests besides the regression tests 
are necessary, please"
                einfo "submit a bug including a patch for this ebuild to enable 
them."
        else

diff --git a/dev-db/postgresql/postgresql-16_beta2.ebuild 
b/dev-db/postgresql/postgresql-12.16.ebuild
similarity index 95%
copy from dev-db/postgresql/postgresql-16_beta2.ebuild
copy to dev-db/postgresql/postgresql-12.16.ebuild
index 5571a39f0fdf..e8a33a497fe5 100644
--- a/dev-db/postgresql/postgresql-16_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-12.16.ebuild
@@ -8,7 +8,7 @@ LLVM_MAX_SLOT=15
 
 inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
 
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
@@ -21,9 +21,9 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/";
 
-IUSE="debug doc +icu kerberos ldap llvm lz4 nls pam
+IUSE="debug doc icu kerberos ldap llvm nls pam
          perl python +readline selinux +server systemd ssl static-libs tcl
-         threads uuid xml zlib zstd"
+         threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,7 +40,6 @@ llvm? (
        <sys-devel/llvm-16:=
        <sys-devel/clang-16:=
 )
-lz4? ( app-arch/lz4 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
@@ -50,7 +49,6 @@ ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
-zstd? ( app-arch/zstd )
 "
 
 # uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
@@ -103,7 +101,7 @@ src_prepare() {
        # hardened and non-hardened environments. (Bug #528786)
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
-       use server || eapply "${FILESDIR}/${PN}-15_beta3-no-server.patch"
+       use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
@@ -134,20 +132,20 @@ src_configure() {
                [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
        fi
 
-       local myconf="\
+       econf \
                --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) \
                $(use_with kerberos gssapi) \
                $(use_with ldap) \
                $(use_with llvm) \
-               $(use_with lz4) \
                $(use_with pam) \
                $(use_with perl) \
                $(use_with python) \
@@ -159,15 +157,7 @@ src_configure() {
                $(use_with xml libxml) \
                $(use_with xml libxslt) \
                $(use_with zlib) \
-               $(use_with zstd) \
-               $(use_enable nls)"
-       if use alpha; then
-               myconf+=" --disable-spinlocks"
-       else
-               # Should be the default but just in case
-               myconf+=" --enable-spinlocks"
-       fi
-       econf ${myconf}
+               $(use_enable nls)
 }
 
 src_compile() {
@@ -448,12 +438,8 @@ pkg_config() {
 
 src_test() {
        if use server && [[ ${UID} -ne 0 ]] ; then
-               # Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the 
same. We set
-               # LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by 
Portage.
-               local old_ctype=${LC_CTYPE}
-               export LC_CTYPE=${LC_COLLATE}
                emake check
-               export LC_CTYPE=${old_ctype}
+
                einfo "If you think other tests besides the regression tests 
are necessary, please"
                einfo "submit a bug including a patch for this ebuild to enable 
them."
        else

diff --git a/dev-db/postgresql/postgresql-16_beta2.ebuild 
b/dev-db/postgresql/postgresql-13.12.ebuild
similarity index 97%
copy from dev-db/postgresql/postgresql-16_beta2.ebuild
copy to dev-db/postgresql/postgresql-13.12.ebuild
index 5571a39f0fdf..275759dd680c 100644
--- a/dev-db/postgresql/postgresql-16_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-13.12.ebuild
@@ -8,7 +8,7 @@ LLVM_MAX_SLOT=15
 
 inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
 
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
@@ -21,9 +21,9 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/";
 
-IUSE="debug doc +icu kerberos ldap llvm lz4 nls pam
+IUSE="debug doc icu kerberos ldap llvm nls pam
          perl python +readline selinux +server systemd ssl static-libs tcl
-         threads uuid xml zlib zstd"
+         threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,7 +40,6 @@ llvm? (
        <sys-devel/llvm-16:=
        <sys-devel/clang-16:=
 )
-lz4? ( app-arch/lz4 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
@@ -50,7 +49,6 @@ ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
-zstd? ( app-arch/zstd )
 "
 
 # uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
@@ -94,6 +92,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+       eapply "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch
+
        # Set proper run directory
        sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
                -i src/include/pg_config_manual.h || die
@@ -103,7 +103,7 @@ src_prepare() {
        # hardened and non-hardened environments. (Bug #528786)
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
-       use server || eapply "${FILESDIR}/${PN}-15_beta3-no-server.patch"
+       use server || eapply "${FILESDIR}/${PN}-13.8-no-server.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
@@ -147,7 +147,6 @@ src_configure() {
                $(use_with kerberos gssapi) \
                $(use_with ldap) \
                $(use_with llvm) \
-               $(use_with lz4) \
                $(use_with pam) \
                $(use_with perl) \
                $(use_with python) \
@@ -159,7 +158,6 @@ src_configure() {
                $(use_with xml libxml) \
                $(use_with xml libxslt) \
                $(use_with zlib) \
-               $(use_with zstd) \
                $(use_enable nls)"
        if use alpha; then
                myconf+=" --disable-spinlocks"

diff --git a/dev-db/postgresql/postgresql-16_beta2.ebuild 
b/dev-db/postgresql/postgresql-14.9.ebuild
similarity index 97%
copy from dev-db/postgresql/postgresql-16_beta2.ebuild
copy to dev-db/postgresql/postgresql-14.9.ebuild
index 5571a39f0fdf..2747e0e2ebe6 100644
--- a/dev-db/postgresql/postgresql-16_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-14.9.ebuild
@@ -8,7 +8,7 @@ LLVM_MAX_SLOT=15
 
 inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
 
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
@@ -21,9 +21,9 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/";
 
-IUSE="debug doc +icu kerberos ldap llvm lz4 nls pam
+IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
          perl python +readline selinux +server systemd ssl static-libs tcl
-         threads uuid xml zlib zstd"
+         threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -37,8 +37,8 @@ icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
 ldap? ( net-nds/openldap:= )
 llvm? (
-       <sys-devel/llvm-16:=
-       <sys-devel/clang-16:=
+        <sys-devel/llvm-16:=
+        <sys-devel/clang-16:=
 )
 lz4? ( app-arch/lz4 )
 pam? ( sys-libs/pam )
@@ -50,7 +50,6 @@ ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
 tcl? ( >=dev-lang/tcl-8:0= )
 xml? ( dev-libs/libxml2 dev-libs/libxslt )
 zlib? ( sys-libs/zlib )
-zstd? ( app-arch/zstd )
 "
 
 # uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
@@ -103,7 +102,7 @@ src_prepare() {
        # hardened and non-hardened environments. (Bug #528786)
        sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
-       use server || eapply "${FILESDIR}/${PN}-15_beta3-no-server.patch"
+       use server || eapply "${FILESDIR}/${PN}-14.5-no-server.patch"
 
        if use pam ; then
                sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
@@ -159,7 +158,6 @@ src_configure() {
                $(use_with xml libxml) \
                $(use_with xml libxslt) \
                $(use_with zlib) \
-               $(use_with zstd) \
                $(use_enable nls)"
        if use alpha; then
                myconf+=" --disable-spinlocks"

diff --git a/dev-db/postgresql/postgresql-16_beta2.ebuild 
b/dev-db/postgresql/postgresql-15.4.ebuild
similarity index 98%
copy from dev-db/postgresql/postgresql-16_beta2.ebuild
copy to dev-db/postgresql/postgresql-15.4.ebuild
index 5571a39f0fdf..734135b53543 100644
--- a/dev-db/postgresql/postgresql-16_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-15.4.ebuild
@@ -8,7 +8,7 @@ LLVM_MAX_SLOT=15
 
 inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
 
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 
 SLOT=$(ver_cut 1)
 
@@ -21,7 +21,7 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/";
 
-IUSE="debug doc +icu kerberos ldap llvm lz4 nls pam
+IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
          perl python +readline selinux +server systemd ssl static-libs tcl
          threads uuid xml zlib zstd"
 

diff --git a/dev-db/postgresql/postgresql-16_beta2.ebuild 
b/dev-db/postgresql/postgresql-16_beta3.ebuild
similarity index 100%
rename from dev-db/postgresql/postgresql-16_beta2.ebuild
rename to dev-db/postgresql/postgresql-16_beta3.ebuild

Reply via email to