commit: 787d4fcfcb2743120c5bf5000962676a20f91b5b Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Thu Sep 25 17:07:49 2025 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Sep 25 17:07:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=787d4fcf
Revert "profiles/desc: Remove old POSTGRES_TARGETS" & related commits This revert series reverts 5 postgresql commits from earlier today. There seems to be a handful of rdeps that need to be addressed before removal of postgresql-13. With this single revert commit, *this* commit can be reverted in future to reapply all 5 commits again when the rdeps are sorted out. This reverts commits: 5adeecf12198ccd5eb12bdeb840a026a59fa3b8b 9718eec39a4ac1e48b216f51341fc2a454e6cca6 353510734c67cdfc622d69823459d7c0e0c8c6ef 7d30725246352824ddff832324ddcd3ceb44ade3 008d3218e93834b16b027ae2953981757e6e41b7 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-db/postgresql/Manifest | 3 +- ...esql-18.0.ebuild => postgresql-13.22-r2.ebuild} | 41 +++++----------------- ...sql-18.0.ebuild => postgresql-18_rc1-r2.ebuild} | 4 ++- eclass/postgres.eclass | 2 +- profiles/base/use.mask | 4 --- profiles/desc/postgres_targets.desc | 4 ++- 6 files changed, 17 insertions(+), 41 deletions(-) diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest index e2655f6d454e..1211cc7192fb 100644 --- a/dev-db/postgresql/Manifest +++ b/dev-db/postgresql/Manifest @@ -1,5 +1,6 @@ +DIST postgresql-13.22.tar.bz2 21783034 BLAKE2B f8bcef336728ead06037aaaebea2329add3882b80f9c81c8cc682304d92d646ff44e29088690d89ad35248e95b0d2333c8203fee0e25ea126b382c049f566a31 SHA512 0f578526aad852285de001369dd1c8308f03479c8f4f6c1a1d066b6b77103e340df95b9ab41df3f959c4e17d4fb0c0441b02a04d3e6c01cfcd40a2632c3ac7eb DIST postgresql-14.19.tar.bz2 22517457 BLAKE2B dffb76d753eefd89ba47708797d7d672eb90ea0f843891507fd0f8106ae6998be298049511b28ec3e06422f8fd2a3c702e883de44903f580e03a4c81d5feff5a SHA512 8f7f49c439b954fc1091c32d857d16e25db0b6f3687d44a6a2360a6c72002545eb2f9d09f2b460aeed3371aeabbe7abf599d92ff60baa2d1e4882a106ad14139 DIST postgresql-15.14.tar.bz2 23229854 BLAKE2B 182b0e87b871b9046b57710899fb013d3c74a81db4bc85494e806a171d53ccc746acf3f9f4cd017d980e9249f00ecbdb6867fc16c1d256f4d8d2dd6e8f65e028 SHA512 6bef254af257eb79a6b4ec1fd09a996351848561a493e529b7e44b053b368753d56cd76de74b07fff6d637606773963e83e4c3bb321682774b12d24dfa1ca8f4 DIST postgresql-16.10.tar.bz2 24977722 BLAKE2B 0b07df6cdd92159ca464dec9fc3f86a806a0a5d9829937f1084e914cac55deff4c3f63b8d9ff1dcac01086b1c1d83ed726c00b007ccd57490bef15194181ddd7 SHA512 b6de80d522f863b0d9dd8c2bf4f71bea309bd07586859e309a9821e7f6fd5839557dc396351e7b61aebf492bf8c8a053a324f059a1dee621ac1a6d5e8eccea22 DIST postgresql-17.6.tar.bz2 21623975 BLAKE2B 9287eab85e17a65333d970bf7d4d254e25295615b4787072ff2a6c705cb66b7775dbe3a0c6b6fa3e2ab37c3278d204ccfdd3e587226d4c1d6363868569149216 SHA512 d377ed208b3fd1bf9611f148f4286e8c655374218cc3b12cd766917063001750f7dede140065874b7c8bdc2f2b3ecaf15c18cc6cd341929b2c3a574a7797a67e -DIST postgresql-18.0.tar.bz2 22412570 BLAKE2B 3ef4759a0292d039e035ddbe20ec3eeb450a68c391363ca29af8c2e31b61a8e2dbd4ae6f37bf8c58e9b21ba0e182eda959d029bc5e061814e13259ab43ff1c1d SHA512 d3a2b460465259c461b1e53555f48881986d3103af6f7c654366ada04ab43b61ce22eb3cb078c70afdac22ddfa5bd9ce2928e3edb110f7f029c958340a980f37 +DIST postgresql-18rc1.tar.bz2 22345319 BLAKE2B 1d5227519390dbcf88e2127e0355ff562b1edb73c0a9a352ab9cacc62464d7fb89f177425b2f662f16522cb3dc57d201505d6351d3957d56e015ba538eb72e26 SHA512 d749790480d142789ecb9f318d2c29ada4e9d3f8925fa6365e6b9ecaeaf0102586dc9fbd377b5587ff9c7b3fd2c1908b141e5b694d2a02fd9cccb03361fa863e diff --git a/dev-db/postgresql/postgresql-18.0.ebuild b/dev-db/postgresql/postgresql-13.22-r2.ebuild similarity index 91% copy from dev-db/postgresql/postgresql-18.0.ebuild copy to dev-db/postgresql/postgresql-13.22-r2.ebuild index 3e3e26f1ca8f..bb3afc1c5a60 100644 --- a/dev-db/postgresql/postgresql-18.0.ebuild +++ b/dev-db/postgresql/postgresql-13.22-r2.ebuild @@ -9,7 +9,7 @@ LLVM_OPTIONAL=1 inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SLOT=$(ver_cut 1) @@ -22,9 +22,8 @@ LICENSE="POSTGRESQL GPL-2" DESCRIPTION="PostgreSQL RDBMS" HOMEPAGE="https://www.postgresql.org/"; -IUSE="debug doc +icu kerberos ldap llvm +lz4 +numa nls oauth pam perl python - +readline selinux +server systemd ssl static-libs tcl uuid +uring - xml zlib +zstd" +IUSE="debug doc icu kerberos ldap llvm nls pam perl python +readline + selinux +server systemd ssl static-libs tcl uuid xml zlib" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -35,15 +34,12 @@ acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) -kerberos? ( app-crypt/mit-krb5 ) +kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT} llvm-core/llvm:${LLVM_SLOT} ') ) -lz4? ( app-arch/lz4 ) -numa? ( sys-process/numactl ) -oauth? ( net-misc/curl[adns] ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( ${PYTHON_DEPS} ) @@ -51,10 +47,8 @@ readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) -uring? ( sys-libs/liburing ) 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 @@ -89,17 +83,8 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-postgresql ) " -# Openjade, docbook, XML, and XSLT are needed to generate manpages and -# any documentation that may be elected. -BDEPEND=" -app-text/openjade -app-text/docbook-dsssl-stylesheets -app-text/docbook-sgml-dtd:4.5 -app-text/docbook-xml-dtd:4.5 -app-text/docbook-xsl-stylesheets -dev-libs/libxml2 -dev-libs/libxslt -" +PATCHES=( "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch + "${FILESDIR}"/postgresql-17.6-llvm21.patch ) pkg_setup() { use llvm && llvm-r1_pkg_setup @@ -119,7 +104,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}-17.0-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}/" \ @@ -134,10 +119,6 @@ src_prepare() { src_configure() { lto-guarantee-fat - # Fails to build with C23, fallback to the old default in < GCC 15 - # for now: https://marc.info/?l=pgsql-bugs&m=173185132906874&w=2 - append-cflags -std=gnu17 - case ${CHOST} in *-darwin*|*-solaris*) use nls && append-libs intl @@ -169,9 +150,6 @@ src_configure() { $(use_with kerberos gssapi) \ $(use_with ldap) \ $(use_with llvm) \ - $(use_with lz4) \ - $(use_with numa libnuma) \ - $(use_with oauth libcurl) \ $(use_with pam) \ $(use_with perl) \ $(use_with python) \ @@ -179,12 +157,10 @@ src_configure() { $(use_with ssl openssl) \ $(usex server "$(use_with systemd)" '--without-systemd') \ $(use_with tcl) \ - $(use_with uring liburing) \ ${uuid_config} \ $(use_with xml libxml) \ $(use_with xml libxslt) \ $(use_with zlib) \ - $(use_with zstd) \ $(use_enable nls)" if use alpha; then myconf+=" --disable-spinlocks" @@ -198,14 +174,13 @@ src_configure() { src_compile() { emake emake -C contrib - emake -C doc } src_install() { emake DESTDIR="${D}" install emake DESTDIR="${D}" install -C contrib - dodoc HISTORY + dodoc README HISTORY # man pages are already built, but if we have the target make them, # they'll be generated from source before being installed so we diff --git a/dev-db/postgresql/postgresql-18.0.ebuild b/dev-db/postgresql/postgresql-18_rc1-r2.ebuild similarity index 98% rename from dev-db/postgresql/postgresql-18.0.ebuild rename to dev-db/postgresql/postgresql-18_rc1-r2.ebuild index 3e3e26f1ca8f..773065596058 100644 --- a/dev-db/postgresql/postgresql-18.0.ebuild +++ b/dev-db/postgresql/postgresql-18_rc1-r2.ebuild @@ -9,7 +9,7 @@ LLVM_OPTIONAL=1 inherit dot-a flag-o-matic linux-info llvm-r1 pam python-single-r1 systemd tmpfiles -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="" SLOT=$(ver_cut 1) @@ -101,6 +101,8 @@ dev-libs/libxml2 dev-libs/libxslt " +PATCHES=( "${FILESDIR}"/postgresql-17.6-llvm21.patch ) + pkg_setup() { use llvm && llvm-r1_pkg_setup diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass index 6f322f5b7573..d743c5d0d165 100644 --- a/eclass/postgres.eclass +++ b/eclass/postgres.eclass @@ -27,7 +27,7 @@ _POSTGRES_ECLASS=1 # @DESCRIPTION: # List of versions to reverse sort POSTGRES_COMPAT slots -_POSTGRES_ALL_VERSIONS=( 9999 18 17 16 15 14 13 ) +_POSTGRES_ALL_VERSIONS=( 9999 17 16 15 14 13 ) diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 85a78606246b..b02c40e18837 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -4,10 +4,6 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. -# Patrick Lauer <[email protected]> (2025-09-25) -# Postgres:18 is not stable yet -postgres_targets_postgres18 - # Sam James <[email protected]> (2025-04-19) # Ruby 3.1 is no longer supported upstream and will no longer # receive security updates. diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc index ba979b37d24f..88c8728d6569 100644 --- a/profiles/desc/postgres_targets.desc +++ b/profiles/desc/postgres_targets.desc @@ -1,8 +1,10 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of POSTGRES_TARGETS USE_EXPAND flags. +postgres12 - Build against PostgreSQL 12 +postgres13 - Build against PostgreSQL 13 postgres14 - Build against PostgreSQL 14 postgres15 - Build against PostgreSQL 15 postgres16 - Build against PostgreSQL 16
