Merge updates from master

2026-09-24 04:59:14 -07:00 · 2026-06-28 16:00:56 +00:00
parent 95ed1e133e 74eea3ef01
commit e5780218dd
27 changed files with 38 additions and 35 deletions
--- a/dev-db/hypopg/hypopg-1.4.3-r1.ebuild
+++ b/dev-db/hypopg/hypopg-1.4.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( 14 15 16 17 18 )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/pg_qualstats/pg_qualstats-2.1.4-r1.ebuild
+++ b/dev-db/pg_qualstats/pg_qualstats-2.1.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( 14 15 16 17 18 )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/pg_stat_kcache/pg_stat_kcache-2.3.2-r1.ebuild
+++ b/dev-db/pg_stat_kcache/pg_stat_kcache-2.3.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8

 MY_PV="REL${PV//./_}"
 POSTGRES_COMPAT=( 14 15 16 17 18 )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/pg_track_settings/pg_track_settings-2.1.2-r1.ebuild
+++ b/dev-db/pg_track_settings/pg_track_settings-2.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( 14 15 16 17 18 )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/pg_wait_sampling/pg_wait_sampling-1.1.9-r1.ebuild
+++ b/dev-db/pg_wait_sampling/pg_wait_sampling-1.1.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( 14 15 16 17 18 )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/pgmodeler/pgmodeler-1.2.2.ebuild
+++ b/dev-db/pgmodeler/pgmodeler-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -13,6 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE="${POSTGRES_REQ_USE}"

 DEPEND="${POSTGRES_DEP}
 	dev-libs/libxml2:=
--- a/dev-db/pgmodeler/pgmodeler-1.2.3.ebuild
+++ b/dev-db/pgmodeler/pgmodeler-1.2.3.ebuild
@@ -13,6 +13,7 @@ SRC_URI="https://github.com/nullptrlabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE="${POSTGRES_REQ_USE}"

 DEPEND="${POSTGRES_DEP}
 	dev-libs/libxml2:=
--- a/dev-db/pgrouting/pgrouting-3.6.2.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"

 POSTGRES_COMPAT=( {12..16} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit cmake postgres-multi

--- a/dev-db/pgrouting/pgrouting-3.7.0.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"

 POSTGRES_COMPAT=( {13..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit cmake postgres-multi

--- a/dev-db/pgrouting/pgrouting-3.7.3.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.7.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"

 POSTGRES_COMPAT=( {13..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit cmake postgres-multi

--- a/dev-db/pgrouting/pgrouting-3.8.0.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"

 POSTGRES_COMPAT=( {13..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit cmake postgres-multi

--- a/dev-db/pgrouting/pgrouting-4.0.1.ebuild
+++ b/dev-db/pgrouting/pgrouting-4.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"

 POSTGRES_COMPAT=( {14..18} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit cmake postgres-multi

--- a/dev-db/plr/plr-8.4.5.ebuild
+++ b/dev-db/plr/plr-8.4.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 POSTGRES_COMPAT=( 9.6 {10..14} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/plr/plr-8.4.6.ebuild
+++ b/dev-db/plr/plr-8.4.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 POSTGRES_COMPAT=( {12..16} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit postgres-multi

--- a/dev-db/postgis/postgis-3.3.7-r2.ebuild
+++ b/dev-db/postgis/postgis-3.3.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 POSTGRES_COMPAT=( {11..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.3.8-r1.ebuild
+++ b/dev-db/postgis/postgis-3.3.8-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 POSTGRES_COMPAT=( {11..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.3.9.ebuild
+++ b/dev-db/postgis/postgis-3.3.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( {11..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.4.4-r1.ebuild
+++ b/dev-db/postgis/postgis-3.4.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 POSTGRES_COMPAT=( {12..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.4.5.ebuild
+++ b/dev-db/postgis/postgis-3.4.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( {12..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.5.2-r1.ebuild
+++ b/dev-db/postgis/postgis-3.5.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 POSTGRES_COMPAT=( {12..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.5.3-r2.ebuild
+++ b/dev-db/postgis/postgis-3.5.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 POSTGRES_COMPAT=( {12..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.5.5.ebuild
+++ b/dev-db/postgis/postgis-3.5.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( {12..17} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.6.0.ebuild
+++ b/dev-db/postgis/postgis-3.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 POSTGRES_COMPAT=( {12..18} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/postgis/postgis-3.6.2.ebuild
+++ b/dev-db/postgis/postgis-3.6.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( {12..18} )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"
 inherit autotools postgres-multi toolchain-funcs

 MY_P="${PN}-$(ver_rs 3 '')"
--- a/dev-db/powa-archivist/powa-archivist-5.1.2-r1.ebuild
+++ b/dev-db/powa-archivist/powa-archivist-5.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 POSTGRES_COMPAT=( 14 15 16 17 18 )
-POSTGRES_USEDEP="server"
+POSTGRES_USEDEP="server(+)"

 inherit optfeature postgres-multi

--- a/dev-db/slony1/slony1-2.2.10-r1.ebuild
+++ b/dev-db/slony1/slony1-2.2.10-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 POSTGRES_COMPAT=( 9.6 {10..14} )
-POSTGRES_USEDEP="server,threads(+)"
+POSTGRES_USEDEP="server(+),threads(+)"

 inherit flag-o-matic postgres-multi

--- a/dev-python/pygresql/pygresql-6.2.3.ebuild
+++ b/dev-python/pygresql/pygresql-6.2.3.ebuild
@@ -22,11 +22,12 @@ LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"

+REQUIRED_USE="${POSTGRES_REQ_USE}"
 DEPEND="${POSTGRES_DEP}"
 RDEPEND="${DEPEND}"
 BDEPEND="
 	test? (
-		dev-db/postgresql[server]
+		dev-db/postgresql[server(+)]
 	)
 "