diff --git a/dev-db/hypopg/hypopg-1.4.3-r1.ebuild b/dev-db/hypopg/hypopg-1.4.3-r1.ebuild
index 0b1f6abd12670..cdc6fb5ae124c 100644
--- 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
 
diff --git a/dev-db/pg_qualstats/pg_qualstats-2.1.4-r1.ebuild b/dev-db/pg_qualstats/pg_qualstats-2.1.4-r1.ebuild
index eb3420d300f68..b24e55db0e3a4 100644
--- 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
 
diff --git 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
index 4752f92fa3c81..415a47965a71a 100644
--- 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
 
diff --git 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
index 77d2ad757d205..56de84ea3dd08 100644
--- 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
 
diff --git 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
index ee1a52f96b70c..d440323ab5cc5 100644
--- 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
 
diff --git a/dev-db/pgmodeler/pgmodeler-1.2.2.ebuild b/dev-db/pgmodeler/pgmodeler-1.2.2.ebuild
index 363bbe634a1ab..e91e4e2a2e84d 100644
--- 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:=
diff --git a/dev-db/pgmodeler/pgmodeler-1.2.3.ebuild b/dev-db/pgmodeler/pgmodeler-1.2.3.ebuild
index 6f0790be80b25..d8828a7d23e18 100644
--- 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:=
diff --git a/dev-db/pgrouting/pgrouting-3.6.2.ebuild b/dev-db/pgrouting/pgrouting-3.6.2.ebuild
index ed7a0df2cf45b..8c0ff780aa2a1 100644
--- 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
 
diff --git a/dev-db/pgrouting/pgrouting-3.7.0.ebuild b/dev-db/pgrouting/pgrouting-3.7.0.ebuild
index 9022b04afc0be..8d8dd2b39e29d 100644
--- 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
 
diff --git a/dev-db/pgrouting/pgrouting-3.7.3.ebuild b/dev-db/pgrouting/pgrouting-3.7.3.ebuild
index 0e6cc74f77545..1faea3e6df722 100644
--- 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
 
diff --git a/dev-db/pgrouting/pgrouting-3.8.0.ebuild b/dev-db/pgrouting/pgrouting-3.8.0.ebuild
index 0e6cc74f77545..1faea3e6df722 100644
--- 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
 
diff --git a/dev-db/pgrouting/pgrouting-4.0.1.ebuild b/dev-db/pgrouting/pgrouting-4.0.1.ebuild
index 77d95e2b6908b..0d2c15993a8bd 100644
--- 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
 
diff --git a/dev-db/plr/plr-8.4.5.ebuild b/dev-db/plr/plr-8.4.5.ebuild
index a75eb62a0b0f0..f89445e362f05 100644
--- 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
 
diff --git a/dev-db/plr/plr-8.4.6.ebuild b/dev-db/plr/plr-8.4.6.ebuild
index bb10bae54f14d..29719f6c335c0 100644
--- 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
 
diff --git a/dev-db/postgis/postgis-3.3.7-r2.ebuild b/dev-db/postgis/postgis-3.3.7-r2.ebuild
index 5cee936b315fe..aaf3fddbd97bd 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.3.8-r1.ebuild b/dev-db/postgis/postgis-3.3.8-r1.ebuild
index a1975a76329f5..f7835613234ae 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.3.9.ebuild b/dev-db/postgis/postgis-3.3.9.ebuild
index bc757266cafb1..f7835613234ae 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.4.4-r1.ebuild b/dev-db/postgis/postgis-3.4.4-r1.ebuild
index 4ea5c666b36b0..7a38a9dd5143f 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.4.5.ebuild b/dev-db/postgis/postgis-3.4.5.ebuild
index 13908bcbaa497..7a38a9dd5143f 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.5.2-r1.ebuild b/dev-db/postgis/postgis-3.5.2-r1.ebuild
index acd7527a5d388..8c1d66ff66cf9 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.5.3-r2.ebuild b/dev-db/postgis/postgis-3.5.3-r2.ebuild
index 7ca89671715af..9e7cc80b848af 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.5.5.ebuild b/dev-db/postgis/postgis-3.5.5.ebuild
index cca81aed7340b..9e7cc80b848af 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.6.0.ebuild b/dev-db/postgis/postgis-3.6.0.ebuild
index c8bb40b997239..c6bbc5ad35a22 100644
--- 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 '')"
diff --git a/dev-db/postgis/postgis-3.6.2.ebuild b/dev-db/postgis/postgis-3.6.2.ebuild
index a6d08e90bcc91..33c4dd232b5a2 100644
--- 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 '')"
diff --git a/dev-db/powa-archivist/powa-archivist-5.1.2-r1.ebuild b/dev-db/powa-archivist/powa-archivist-5.1.2-r1.ebuild
index ac54fba65a673..ab814d5307b78 100644
--- 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
 
diff --git a/dev-db/slony1/slony1-2.2.10-r1.ebuild b/dev-db/slony1/slony1-2.2.10-r1.ebuild
index 1115cf1c68351..9c092ab502c29 100644
--- 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
 
diff --git a/dev-python/pygresql/pygresql-6.2.3.ebuild b/dev-python/pygresql/pygresql-6.2.3.ebuild
index 8ea91f6a5ff89..00265b657fcd8 100644
--- 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(+)]
 	)
 "