gentoo auto-resync : 19:01:2024 - 20:08:27

22 files changed, 249 insertions, 57 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 860177d34582..790297d1053d 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c1121fbe47a6..5fdbde56cff8 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -9,9 +9,9 @@ DIST mariadb-10.11.5.tar.gz 99709948 BLAKE2B 97429df4f0a10eb72c74dd0e951954b7c09
 DIST mariadb-10.6.13-patches-01.tar.xz 4984 BLAKE2B 625d04310b02aad4fec4b633e9fab06636364f3c5ed3cb88e89acd4224786c3c9ed478b636ac699e77a888b73dab12cb279df41d6095e93e9c4ae3a159570286 SHA512 1e6ac167bfd77570e8ff5955aaa9a101d9387ac4857d856f1fb8c9a489c4c2a154481b9385584435e8dc95baef0dd3ef6831c7de2d6f004401cc338edcaa9d12
 DIST mariadb-10.6.14.tar.gz 95286643 BLAKE2B 4a186f3f52b63ab7321aa7556776ff8a986bd602d78dc6a143cc3bfdfd8cc09b0a22688cba02b8907f4b3f0d1e7c640f5caad768c1e89486d6af24e6cf3168a8 SHA512 11b88480ac61303172e98ed3271c8172e840cded5175caba1469d6ec063df647b536ee6e95f110abd8d95d95c9b8d7edf1cb611113be225d5e8eeb2041f86438
 DIST mariadb-10.6.15.tar.gz 98204031 BLAKE2B 4534b82f1c1e16ce2c7c21879714e24b20fada36ef10a8a0dbe770c1d99055822fcaf146646b19b459cfd948bff0662d23f1f661a843919f90a354838bda7ee6 SHA512 61b5af8c2f8bd2f641aaa708941563d5f6ecc118acc9a154c009c3ae1d50e7360ae59241f87e5c2111775a3ffeb42a64f4853e9c7096b58d68a3695b5d0ef97c
-EBUILD mariadb-10.11.5-r1.ebuild 42319 BLAKE2B 3213ac7c988ae28bacf9deea9dc4f0a2efe374015e98e7107e62e96935a4174cf63debed9ee32e9644973c62466535b667146e604a59bd96c27dffdeafb3fa14 SHA512 fe81d26f8c528bfe882ac12690061e164aff1f836fe2b38f524fa3916d2ba79e211f8595542126cc0e01540c8782d722a21118f64e226c0225afb286510d2f92
-EBUILD mariadb-10.11.5.ebuild 42446 BLAKE2B 7d233a13ee4af25916a2a8324be1d06405290218594a2f5b6503c2b46da746a2ff635f9b93fdb4737defea861c5dceae9d59587dbd60fb044230cf6fcc218b42 SHA512 0ced4106774281152d2219f6c63ed667c925707c3bc58d58d4b501b7533c8411139c426af0aa9d84b84e4e032468362cc55b15184899e77429170fc6107f8dbc
-EBUILD mariadb-10.6.14.ebuild 42705 BLAKE2B ac75e4cef39cfc5a2641a85db1fde75a94ad01dfbf292bf19f5d7a4f0292d9a67316073cfb70b0d9a38987db49fe2e4acd3615f7bc6ce10fce0aa67013aff306 SHA512 31d5d1d9f864c07fe9de4b7b6315aad999ba831c9d5e43c1214a2a182c29ea51fb55751ae885e63f7f7794a33572c3f400194c63bce70fbcccee9841114ea370
-EBUILD mariadb-10.6.15-r1.ebuild 42578 BLAKE2B e1135ad28f09aa68d4e68dd378b1a026c92b7d90194e113a3d5ff46cd7775488e37a9fa42195866f4ac8d6b7cea6d1e7e4c0d258f7e21112927c150de8847fef SHA512 60024cfca6ce61d3fe0eda6eb5dc16c9db802bf9faf43b96e5ef66aa9ac073b8bb2d218e59be4d376c25a946df1c06b6cb626b3ec67bffb0f79381e46bc589fd
-EBUILD mariadb-10.6.15.ebuild 42711 BLAKE2B 20d9e969865fbc13543e6b30ec130363b202fde8428900d8050e80e0b72218cd824079038963f975ca76a45122ae67c8bd6d5d97352d94ac1635c233ab5c872c SHA512 b39528257fd34de9d158569d94af7f32f0933d82d1790298ccdd06be3289cc7f36c462cf0f59cbd06eb4acdc0ad82f54ed4c53d8b93c54bf45f2c47949b8d1a5
-MISC metadata.xml 2414 BLAKE2B 40d3fb9596fb78349865a27549c5504ccda7b3a601b6abea053328629a0a8c936633e18266f07b5bd239defb71e1501a77efc6f44d0ef339d618c5e0b9cd9762 SHA512 f6ab36d58e5c711f4b808f1cd0454c3a87473c6e57dc35edd897bb25a7f0e74abbaa24db70832d84c1c287600216f4a72185352a6770d89ba45590563e3eedd1
+EBUILD mariadb-10.11.5-r1.ebuild 42320 BLAKE2B ec08ff49719daa40cd1223f79195fcb5060608f78a0660c8641cd67c662d4a8f8bf3fa0006c6bc271818858f2ac49ea2e2d4bd1a2a6447653256f9f0492156a2 SHA512 7790de4ea2a85937e9a12b30b3bc5d4e623603b28f94d47e189cfb8b7c89e8f9b415d589b64ddfcd57a7ad3838e8af3ca04f15f9b1c65a28c46f42b484f56303
+EBUILD mariadb-10.11.5.ebuild 42447 BLAKE2B bd3a7b82f5f1cc05d658ac7deb79bc53f8406753df585057c5c89ec56432cf76793c498bf7b17e7b40e9a8a3172e45ee0f6ee39f7c80fc622a410b4d216df400 SHA512 f8f9516829abc6bd103ff1b0f2d08a29182784d990ae40ac5c7810252567d9be4163478b923bed8f60b7116b22750ff90e327742d6412bfdf6870625a9890600
+EBUILD mariadb-10.6.14.ebuild 42706 BLAKE2B b88ee7d926b386ed56438f8bdd2632c95b1ce14eaab52a5aafcd8fcfbd5b7ae3f8562352d990a9228a3a6ffa5d41f0acdb468c3f52bc9e0cb09745798a4f6d26 SHA512 9d53ae2af232c9afd7ed13319aeae2997047b5df0019ade4bf14c003bb2d3ab2bbf474812d10a304bc9f067d3cb66e487576e6a706108f0931fdc21e51dc2b5c
+EBUILD mariadb-10.6.15-r1.ebuild 42579 BLAKE2B 0920a9b2428a61bf2f9bc638438904d3e19cfbb420f8716c6a1bbafdf896a8897c522e4069d6d7318fb6c11fda35992b31abe47de6c33a6331a08c1394f97257 SHA512 3d0160507fb25111a1a44bfa64c4830c696f846e660afb6507e2a3202daf8bba348251912dca313a92a8d8de17b68e6b68d718f15050fb7d3e0045997c6c23e1
+EBUILD mariadb-10.6.15.ebuild 42712 BLAKE2B 487a0a1e463421afc9a33643b8472ade80e8fa8b5f8cc5f4cc49b52f6f7a07bd18bfcec4d4af77509834432f1b088dc521f547ca85bc35ae89df13fdb1ea9657 SHA512 2dd4d7e2281199786c544c30db54515dde38142b4aad8331b9a9c05ce0d0f21d2c0036143c2a574717c44e0735cefb1c2799b25af1a8e5ff887fe03236e1d80e
+MISC metadata.xml 2415 BLAKE2B 15e491cb0881203b21f66652af9e420582e3992a610bde08dfae2d076c417b298529eafd659adaa4cdeecd70b0c10c83796f8dfd8fbdede7489c48fdd2bdb015 SHA512 ecc641157ada5ad6d84b534b6a40e27e59ef428668d61f3908817735d31d4828dd0327343bf4ad13a5f6a1bc306cc46137388489176c3116f2a0e0946471b49b
diff --git a/dev-db/mariadb/mariadb-10.11.5-r1.ebuild b/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
index 5bca8e1d422d..472a40086fc5 100644
--- a/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -81,7 +81,7 @@ COMMON_DEPEND="
 		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	systemtap? ( >=dev-debug/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
diff --git a/dev-db/mariadb/mariadb-10.11.5.ebuild b/dev-db/mariadb/mariadb-10.11.5.ebuild
index ec6228a419cd..c691d5658367 100644
--- a/dev-db/mariadb/mariadb-10.11.5.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -81,7 +81,7 @@ COMMON_DEPEND="
 		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	systemtap? ( >=dev-debug/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
diff --git a/dev-db/mariadb/mariadb-10.6.14.ebuild b/dev-db/mariadb/mariadb-10.6.14.ebuild
index d1edd500cbd9..3b1a5a8595be 100644
--- a/dev-db/mariadb/mariadb-10.6.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -80,7 +80,7 @@ COMMON_DEPEND="
 		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	systemtap? ( >=dev-debug/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
diff --git a/dev-db/mariadb/mariadb-10.6.15-r1.ebuild b/dev-db/mariadb/mariadb-10.6.15-r1.ebuild
index 6b5a74e3d1b2..08838ce16253 100644
--- a/dev-db/mariadb/mariadb-10.6.15-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -80,7 +80,7 @@ COMMON_DEPEND="
 		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	systemtap? ( >=dev-debug/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
diff --git a/dev-db/mariadb/mariadb-10.6.15.ebuild b/dev-db/mariadb/mariadb-10.6.15.ebuild
index 0675af87264c..fbb24f57a4b8 100644
--- a/dev-db/mariadb/mariadb-10.6.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -80,7 +80,7 @@ COMMON_DEPEND="
 		s3? ( net-misc/curl )
 		systemd? ( sys-apps/systemd:= )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	systemtap? ( >=dev-debug/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 	yassl? ( net-libs/gnutls:0= )
 	!yassl? (
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 9dcb6c6d11e8..909151a47221 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -25,7 +25,7 @@
 		<flag name="sphinx">Add suport for the sphinx full-text search engine</flag>
 		<flag name="sst-rsync">Add tools needed to support the rsync SST method</flag>
 		<flag name="sst-mariabackup">Add tools needed to support the mariabackup SST method</flag>
-		<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+		<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-debug/systemtap</pkg></flag>
 		<flag name="s3">Build the S3 storage engine</flag>
 		<flag name="test">Install upstream testsuites for end use.</flag>
 		<flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 24f0dded69a9..af501015c32a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -15,9 +15,9 @@ DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701
 DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
 DIST mysql-boost-8.0.32.tar.gz 436207624 BLAKE2B 8a75fd6fe12d4f870622b3386118737b8f17d116df625ef6187647c870d456823543e0a1e9aa05fff53313c3872df1df23add2508ec735bb7972718fc1e90539 SHA512 937e0d0350cb583bb4de15b080f08ed92b253a6d7c09f13a028855dae154fc84f0c95fb082b818b2fa6fa792cd2d9db8d7dc7a20a2a0d3d2b6839fbd2c821b44
 DIST mysql-boost-8.0.34.tar.gz 439550780 BLAKE2B f50701b7e97e6cec21d6ce0f80f07a8df68a14c637a67841c06f578be8ed01d216dcb3b859a29f1befd4223b99e60675d6fa70f4b227bf6af81804e2c43161d4 SHA512 e5e79ac6870c214cf62c8e2830106d60e09d2e6df30654b84bb5d26864b4eabe777468a223e6ee4c1e22b7f6ec086c73e85e3f4c1fa66912b0e59b606ab46cd6
-EBUILD mysql-5.7.41.ebuild 38637 BLAKE2B e7bd9f58b098e1cf8ec6926b670ea62e6ee1dd82287755447a49a171ed1229e970c8c83a2b48bdabbd8fe3187b06b8d7d972e6c6cc948a3bc451abb9e1ce82a1 SHA512 05e5b1593bcc6c6668a56b06e7fcb0b8427a89be56e0a03f232ace1593b81eba6424cba61d84e4e20195472f3f0c54e9063b175de4b076e63ad46c389717a604
+EBUILD mysql-5.7.41.ebuild 38638 BLAKE2B 4a16cca1bcf882a14033213e3f90e97f5f0a2ea07e080904629b2f5ddfcaed3e8ed199ea478ef6d5825c3b2c366c6e9d53b2cc49ce3cfee6261463d359825941 SHA512 43a741a197b63e3d2c262cecafee90ec9877563bc795e786674f3e0ff15ddf37685ab77b12c4460a51f5aad02dbebda24f9cbec7bb3d133faf0fe83b79e49feb
 EBUILD mysql-8.0.27-r1.ebuild 40678 BLAKE2B dffb5a4a547ec86b0e74f5ef2198d03170f08549aa6e90d103875cb8e69c2c8c83f5ae030859d395987e475f41658f7dc18c654d89069f730c73da621871711d SHA512 a0ea13e22ff7b78ebb444411208a193be85182d09eb9a3b2e575164793150ef8940ec3f263ba96e82d07c5b24c3ee146e6b8d39bddd2edb4499b1f307df9308f
 EBUILD mysql-8.0.31-r2.ebuild 40724 BLAKE2B e8bc05e18f9430354b544695207f1404c07c2500da2d9eaf9fdfad135ce5e2f80268a4c8e70d226002c87f6612fd5fd0dcfbb6bb13a5c6cacfef9a37871caeae SHA512 505f087207e6f4db5c4228df14211b879df2285d89684e83e31dbbaa9c7b1fc00b03625f43c9e987a35b0639b784b1cee8d0b44b9e3152716cb0fbd3483fe1fc
 EBUILD mysql-8.0.32-r2.ebuild 40468 BLAKE2B 339a729c1bb40060ec16e19b628e5b4fc3f89b8b6c61135d24cbfdd3ce93a49ea525bacc0853b19046067160fdf6c8bedb1dd573593972f08cc4491e60164410 SHA512 29ba8b57a99e92333382508bfac61cbf69f4fac428a62948232c90b96217690049a99097512e68da6e74d50dd460f642e728e99af68c5a0008f7117376f59ce1
 EBUILD mysql-8.0.34.ebuild 39797 BLAKE2B 3abf2c89f1fe28252890737e0af0add7a4383332dd4f855d0162e5f2b5b806a7f457aabdfb1547feddb2fa91a3aa6262e29c73b9562530ecd9defa479880b549 SHA512 d0e828a1ed009d5e795cbd208ab719367b60f41df88b1c7a12415eb1fa97f5f0615c8b8e873664d78f2272374b33788fa3d832b5ae15dc003c79382acb8c7937
-MISC metadata.xml 1352 BLAKE2B 81b263eaa05ac8a0bd2cf0e84bf51ff4a07d8ca74e6febf8cbfea7b85f78a3d682549b1471c9d5a96ee21cdcfffcd4376246b5c9f964e73d7ebc68a4e026f5d6 SHA512 f9566f7d6c4892eda73587ac70eab66b98437d3a9512a7a036590a2347ef2a98946bf33bf22f6270b50a54966db31b079cf217dc6bcfe9087bb72ad95c9bb327
+MISC metadata.xml 1353 BLAKE2B ec0454ffdcce75567e9817fa199f1e6ec1ac73520001c299b794cbfebcd42f9e5abfcf9e6faec47bd0b04f40b03846798f1735e1561c91e4e3c0df48627fe4da SHA512 d5f33d05fd1505d13afa2e968cbfcbe1c6ad6a581468608ed1fd88daf1dd17dd66fbc55b8b6eceb42e2d03bd4327985ff7432c668f983775b103e4375b4ad8c6
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 6ee2f3d235f6..8cf9fbadca70 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -19,7 +19,7 @@
 		<flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
 		<flag name="router">Build the MySQL router program</flag>
 		<flag name="server">Build the server program</flag>
-		<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
+		<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-debug/systemtap</pkg></flag>
 		<flag name="test">Install upstream testsuites for end use.</flag>
 	</use>
 	<upstream>
diff --git a/dev-db/mysql/mysql-5.7.41.ebuild b/dev-db/mysql/mysql-5.7.41.ebuild
index e06cf85e23a5..016aa962043a 100644
--- a/dev-db/mysql/mysql-5.7.41.ebuild
+++ b/dev-db/mysql/mysql-5.7.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 		)
 		numa? ( sys-process/numactl )
 	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	systemtap? ( >=dev-debug/systemtap-1.3:0= )
 	tcmalloc? ( dev-util/google-perftools:0= )
 "
 
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index df58612261a9..f89028023698 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1,9 +1,7 @@
-DIST pgbadger-11.5.tar.gz 2305597 BLAKE2B 1e88e52ac5861343e7122784f3ec1ecc38e67a2737db49a05661de473c990992f924c887eb86e34d3ca80d329c01af4a60893af5436d8a291bbeae0d7fdc0e81 SHA512 ed02066250539d339d5aaaab784522eac37580873e8a5adde5b565cf6d11447fad469cc23b4ab88425b0322521b4ededd1f5a24670b0b9fdbd65aaa31e4e4088
-DIST pgbadger-11.8.tar.gz 2987593 BLAKE2B f6f5aeaba4aa2d982a3b71463bd6a02e47078d2491a703bdbeb81b349790807eaca91794be7b850dfea86615f9e8142f0513af2f68e3ff3fd0908ac50645bf18 SHA512 78082a4c9c4ca1836825d5b1718555951f29630b26eff20f30dab03d3cb30395107d6854e09f47143fb099ccfdb8d7c9319bc80f787792a33cdda70abef7bb38
 DIST pgbadger-12.1.tar.gz 3041661 BLAKE2B 0489b52a56b20442f4ad9c2f22c63eee7049ad93b65166d4d87a96aebf8ca20dd3709291fed4a31df77c0c49e4efa10a66d9c185b9f7f66818057aca1a83a607 SHA512 16cdb64cd425b58d9f13a4ffe06eb79aeb0238c585e325ed7f1613a32a960fb19a5871c29ebd082ffc52b063b8da16d22ded1367e47557473389ead001dffc06
 DIST pgbadger-12.2.tar.gz 3044596 BLAKE2B ab25e4b52099fa22d8e0bbcc1e0702fc9ec0982e00027a28e3b5735d456058d7b2f2b67dc1e9c857fb87bcea7ae273eeb3b97a260fb5387ccd768057e11a826b SHA512 b07dba94a0eb57cf8559439660204fd40cb3f2a9fc9a8fd4c0200af1b41a13bad2bd908f9019ecabce2f17c76fcb6d364b2b3b64c64028d4e40665df1075bd5d
-EBUILD pgbadger-11.5.ebuild 453 BLAKE2B 2332b2fda3b6a22617380ce112722492a982dd0da2aba7917d02db9e5b216e94fc64461c05269089f2fd09c796732a9091e1177511d805fe02a1aaa8e42e5f01 SHA512 7d6aab2031377402fb51c50f6adce3ad6b157612ac906a9e5feb64c3a5e26e120f05e24afbdb399ee088b7f3a22b5b9737335b7c899fc8b5118e3da842306769
-EBUILD pgbadger-11.8.ebuild 451 BLAKE2B d504a46fd1944398f6fc86c70a51ade480648ec70fffbcd53e4a9e1746343e1c6b96fff027e018aee2bc6af9c8ba3d1d37a605b56085fa50a677e2b741f3e6c0 SHA512 d0b233fd11c046ed7d6a84a81be1c399ea69f271e6ee9bee61518beb49b3fdbcc268787ff080b6d8abeeb98afaa2fa085bfcd26edccb4fb401edaca02d3d0d3c
+DIST pgbadger-12.4.tar.gz 4062907 BLAKE2B 1922d486a2ef4f87267156c2ebb5f038cbf5b48dc5a4dce80a517cbad000e5d4545b36c6a2404f699d987214c97ae9c867603138b8781131a71591d206adeaa0 SHA512 251035796275ed51efa2d3f45f8cf79c5ed89af34ee8b65c1ed2f481699152902a4f8820b316d06e4cf6528f894bc29ddce2b2ef2524e326a081f9412b9416d8
 EBUILD pgbadger-12.1.ebuild 451 BLAKE2B f7f85f8b69b84e2f05da3f19468857d1eeae4703bf94dc7935a7095d3be45fd6c231db7e184c919a57a0d3bf8fbc7c1cf16f805b676fe356a06f33d27177e240 SHA512 28668f189accfec86f412f3a39758c2634ff2d27184accd7e3c3c9edc645b07ff05713f29df2272ef47250e791c47826118009004a4aaace00db755e61f6c42d
 EBUILD pgbadger-12.2.ebuild 475 BLAKE2B cccdf6f5f5f910965a3dc06eb693d6cdbc743c658b3f2e8558cbc6d92cce428537559124f86ee530f64650881db7f583c4c352ad8bacabc956da77dcdc69378f SHA512 e3d5266ba7ddd1a33992e76650f7ed23f5135014fc2f44162280c141e1e18f7e8fa1d6bf139a153b3585100705054a57cb9f4557999cc165f0855917dcec82e9
+EBUILD pgbadger-12.4.ebuild 475 BLAKE2B a21ce578b25eed4911d24bccb881a49a8020677f7df674c115af744111bd5b15db8ba714a6de563df4b1164eaa2a10beace1103f2f965adf5ccbe0387fd65b08 SHA512 5c49e86ce8c3ca45410b82c3f0b07871e899bd68566ed2bf2ea366985ad6b17c3d9a8f4d1e2366f47ab30c16aa66563e67824218325e1dd8ffc409d3bbede70e
 MISC metadata.xml 414 BLAKE2B 42f020ca08e7604b1c1b3e1d19ca62b4a19dc306c733fcd25e4536faf83dc1d6f0f61c2060ebaf8fea33b1818a4d98822e702f4b8b341b2d622e380af39ce535 SHA512 f9ccf0f1896c38e5fef1f51c73abad9b2169166d62ed8ff356d6a2ea7ce8fd253248e99a43286d5fd82a78128c579eea9601e2bb18b51d28fa613c2274de8bde
diff --git a/dev-db/pgbadger/pgbadger-11.5.ebuild b/dev-db/pgbadger/pgbadger-11.5.ebuild
deleted file mode 100644
index d9ced5d973ea..000000000000
--- a/dev-db/pgbadger/pgbadger-11.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="pgBadger is a PostgreSQL log analyzer"
-HOMEPAGE="https://pgbadger.darold.net/"
-SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
-		dev-perl/JSON-XS
-		dev-perl/Text-CSV_XS
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	prove || die
-}
diff --git a/dev-db/pgbadger/pgbadger-11.8.ebuild b/dev-db/pgbadger/pgbadger-12.4.ebuild
index 31a09daa2bfd..ffc67f024940 100644
--- a/dev-db/pgbadger/pgbadger-11.8.ebuild
+++ b/dev-db/pgbadger/pgbadger-12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ KEYWORDS="~amd64"
 DEPEND="
 		dev-perl/JSON-XS
 		dev-perl/Text-CSV_XS
+		dev-perl/Pod-Markdown
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-db/pglogical/Manifest b/dev-db/pglogical/Manifest
index d1f4fd9cdbc2..e2dc195da8a2 100644
--- a/dev-db/pglogical/Manifest
+++ b/dev-db/pglogical/Manifest
@@ -1,3 +1,5 @@
 DIST REL2_4_1.tar.gz 277428 BLAKE2B 51319e3b1491e1857e63e63640f2e6d2315ab72a0aabcfe7869456822a294bdb53fd0f4cc9bca0c60bfcf9e0926249acad86f09327c5656735b508851037ccaf SHA512 0d673e1a2b696e2cfbb94d8350bb15c280947f69b6512aa80f8ef7497e30cbd407a01b9a4f8fa9844b4ccb39377a6b2bee390a7887f3050074c2e6a11e6f3e3f
-EBUILD pglogical-2.4.1.ebuild 768 BLAKE2B 6c72df85c87f322f50d15b07f0d07e75210b0d13d0d9d2d8530d1342427425461fe7964d7c37326e7b62f2cccc8a7c273affc31e4957a6e5196ad8a04c7dcee1 SHA512 b9f587daf0262f9da74136995ff11019c12cd29d5c790f5efd3e1cdec8a04c9ecb19811b49e2a7b3b6f1a61a48bba0316d60fe17236e063e50a8c0eb9f48f4f3
+DIST REL2_4_4.tar.gz 280564 BLAKE2B 67d9cf090117875f58d671987fcd5593b9db5b78b31c79fc44c23d4ce5ebfcb1eb7b970ebb026ca6dedefd958081a3bc4ef7ce502e7edda027a5d082f879e385 SHA512 163b5f6ea61fd83eadbde843745d72ebe7f1fb401d5506c9bbf3689871e5b81c85e7536103080a71fa6567942f4278326a0fb232e19f432665757e23132be94d
+EBUILD pglogical-2.4.1.ebuild 760 BLAKE2B 80b18812857f8a6fe6fe4bb61211212d7d73fb31e1fd56c41e68a3669a4214f192983f0556b3c3af4192961ea25f12de1abd4b1e8db50a4956e3d7d113bd7e2a SHA512 b8989cb4d4de0547acccf3334db25e63aecbd2bdc117e6aece872f2e888f4fa385393470ee6591a12d203cfe1ab71852a9d3d2a3306cd501329fb4fa354f0722
+EBUILD pglogical-2.4.4.ebuild 803 BLAKE2B e2be4e23db2d33bbebf293efbff816e972f39350006ace9a7763268640d07d856f47869ae5ad1a1639836372276e676a3366553fb8d0184ea0a86627763e96f2 SHA512 7a0eef8e4fadfe2f18ca92e5347091692c73161253763740df2e0a04be1c685e9dce256c7620ebf11bf6a682ac108781f6cb2feb821f214e7001c24c64a2d2fd
 MISC metadata.xml 335 BLAKE2B 41964f27ce4a78ae765c897487045d3a9299e13fe764a4ad0b6431332647ca13fbd6fd1a3300f33cd932d465339b2194fb056d48bfa650b14b97645d64b023d7 SHA512 7e5b88b6babe2868eda05a151ab4e9e130caa57cb19fb494256a537df2836c50f31c801f5ec3894cda0a8cb871727c894272464bed108c45f96763ab86c9bc82
diff --git a/dev-db/pglogical/pglogical-2.4.1.ebuild b/dev-db/pglogical/pglogical-2.4.1.ebuild
index d886bbb793cf..75619daafadd 100644
--- a/dev-db/pglogical/pglogical-2.4.1.ebuild
+++ b/dev-db/pglogical/pglogical-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,6 @@ SRC_URI="https://github.com/2ndQuadrant/pglogical/archive/REL${MY_PV}.tar.gz"
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND="${POSTGRES_DEP}"
 RDEPEND="${DEPEND}"
diff --git a/dev-db/pglogical/pglogical-2.4.4.ebuild b/dev-db/pglogical/pglogical-2.4.4.ebuild
new file mode 100644
index 000000000000..27bba65b9239
--- /dev/null
+++ b/dev-db/pglogical/pglogical-2.4.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+POSTGRES_COMPAT=( {12..16} )
+
+RESTRICT="test" # connects to :5432 by default, not good
+
+inherit postgres-multi
+
+MY_PV=$(ver_rs 1- '_')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-REL${MY_PV}"
+
+DESCRIPTION="Logical replication for PostgreSQL"
+HOMEPAGE="https://github.com/2ndQuadrant/pglogical"
+SRC_URI="https://github.com/2ndQuadrant/pglogical/archive/REL${MY_PV}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	postgres-multi_foreach emake USE_PGXS=1 || die "emake failed"
+}
+
+src_install() {
+	postgres-multi_foreach emake DESTDIR="${D}" USE_PGXS=1 install
+	postgres-multi_foreach dobin pglogical_create_subscriber
+}
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index bbedb323a3b2..85b9a2bbfc61 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,3 +1,5 @@
 DIST pgtap-1.2.0.zip 319374 BLAKE2B 1cea77860a1928ed7cbf4ddb0bb8ff418023bf88e377196ae2b505c065321e3003179227077567e676a8c551230d259ecd1cdb590001fc71bcc821b87fb3d0f6 SHA512 5569bea5e7879787a91fa9b2baae5cbff1db5b9a5a096db2a9a064012d65e02c52bd1520422b5e6f87fb5b6e64845371188ea53c43a277aee68ffc05d5152ed7
-EBUILD pgtap-1.2.0-r2.ebuild 796 BLAKE2B 5f54b8291e1b1879836a9e599cdd26ed9e1deb1f0c1c3a2714928c284a7197827e336fc60e9b7ab84278c745ef3a07a79d335c8c5610de9b49c9315ab0ef8052 SHA512 52c4f031f84b5d75d05e5d57d56cc67834123c47f440ac9c10ed689ded80585568a7327c6a6398a73cfc312af30cb58c9c183a61902bb73f49e12c1dccea631f
+DIST pgtap-1.3.1.zip 654637 BLAKE2B 412dfcb51813552541f935328e28fbf8f0a014536a5eee8bf55ea680cd22a6424529641040627f91afebb407872d8d3d4aa25e576d965ddb11514229c2b72591 SHA512 98129bbbdf2221502e52375c3e55dff324e69cb930865d1589949ad2d96ddeac1a215e10d0612f7cc050d9a725817b01b23a9cc3e9cb42ef23a929e593ecb698
+EBUILD pgtap-1.2.0-r2.ebuild 788 BLAKE2B 33641422ba4105824dc10647f5097959d0c34e3f8f86ddf70807501b6e1bb150e202447e608293b25f39f2c59190c9e74b0fb22282223e9bc0101434913da3a8 SHA512 0723081946ef8db4dc7be3a6923351e89e970227ecce05cfe09bdeae1241db096d23d5901072beb299a9fc3082373e67792b84f3e8b0f1f9f93c231cb34e7ac4
+EBUILD pgtap-1.3.1.ebuild 784 BLAKE2B c595aea0ca4ee8b34dfdd2713b685363bd49367b1940bf931847611a7ea8604d90259db1942b8a59b3f4817ec7be56506e860afd900192d0425b46685b86a983 SHA512 9f2b7ec33fce20904494c6d42d5a44e2840aac539dcc083cd363d1a9fff53813197f2d33fd42283680e82e84da79094e432b58ff6a44e4b95344a901b06b831e
 MISC metadata.xml 629 BLAKE2B e7052e443d1a9c728bce35231d7aa287b2844409cc69ecb42b563000a7908e1db49d1a85fe01e8bcafb27fc2741181869895582a77286a0eb16b101ca672d3c4 SHA512 9a3f6c41f8a6577b0c2e29d81549644cf2c74f742aa3f4fca182e6588cc380ac3d2fa5ca07b931d41b24ba0021b81f462d316071ecaa1c3d813cbfa76603f063
diff --git a/dev-db/pgtap/pgtap-1.2.0-r2.ebuild b/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
index a62f1fe0a5ee..a4658a7fd8c6 100644
--- a/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
+++ b/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE=""
 
 DEPEND="${POSTGRES_DEP}
 		app-arch/unzip
diff --git a/dev-db/pgtap/pgtap-1.3.1.ebuild b/dev-db/pgtap/pgtap-1.3.1.ebuild
new file mode 100644
index 000000000000..6ecd9a456893
--- /dev/null
+++ b/dev-db/pgtap/pgtap-1.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {12..16} )
+
+inherit postgres-multi
+
+DESCRIPTION="Unit testing for PostgreSQL"
+HOMEPAGE="https://pgtap.org/"
+SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND="${POSTGRES_DEP}
+		app-arch/unzip
+		dev-perl/TAP-Parser-SourceHandler-pgTAP
+"
+RDEPEND="${DEPEND}"
+
+# Tests requires a running database that match up with the current
+# testing slot. Won't run from ${ED}, want's to install too early.
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_install() {
+	postgres-multi_src_install
+
+	rm -r "${ED}"/usr/share/doc/postgresql* || die "Failed to remove improper doc locations"
+	dodoc doc/pgtap.mmd
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 389c0f473725..420cd4ec190b 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -13,6 +13,7 @@ DIST postgis-3.2.6.tar.gz 16886873 BLAKE2B 9bf8375c08d434c0eace1807154c041d06384
 DIST postgis-3.3.2.tar.gz 17793976 BLAKE2B 40dc7636f04e0d5cfd734b175da1ce49c32e4b8f5750059e79e03a7395fb8b9241c1f479815794b46dee81704d7c392fe7693c9f0180323d1ca21812c37d36b5 SHA512 4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
 DIST postgis-3.3.3.tar.gz 17790503 BLAKE2B d5390e3e0713b2f74db0c6d7f953681b49611937442f89cd316b43315257db0e0734b6cd23b750a88d9fe503c5348c98578e12cfe6fd8a382fc7817d641e89cf SHA512 0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
 DIST postgis-3.3.4.tar.gz 18591029 BLAKE2B 5aae3804b8abcaf8436cc57c53e288f68e317b5ab930a0651f2f55fc825f9c3d6cdf43b74cb7a845de385d019737759e6ef127587015f28851734ffeedbc64da SHA512 b35811ffcb7fdddbe5d4714216f714b687f92e6984614f20c6bfd4a498e6422a3035fd0de9a0afd0a04c6999d8b8a68e0f93a5bb75f893fcb6d3c3f64fe65726
+DIST postgis-3.3.5.tar.gz 17785894 BLAKE2B 9c710430adb68d92e8326caef6c5a1117a398f04f31bb58f3b38818f3194866eb4906b843e82e4b8e4790717f778690c27f2c856263431e5051412c79c50fc55 SHA512 f9d400d7e9db0acd12ada051922e6baf566ae9ad182af937873765a64bd4e1b4948951da4a173efe7d1f85b3ead0065c6ea9b05860a78cf9942c523bacd2d351
 DIST postgis-3.4.0.tar.gz 14693348 BLAKE2B a7ae007edb12a796f58b24ec8f72264e154900335a2da8c9358dcf0455a4ff183bb77036f45a77aa3533913ab2a802a4995ce17913ef355c52e5c1d8132c04a6 SHA512 d8c5329e5394bfe1d77a207d35cf8100217d39236cfeb228e268c796e16e24068df2191403830bf190b7ae9fabb21003675a091a8cc6dbfeed9b4b02cbbb9d33
 DIST postgis-3.4.1.tar.gz 14942851 BLAKE2B 98ef490b08438c5ee35409a1c5c63d985d3024325d607a7a150b197aabb8baaaa70ec8c4bd5134136f92a106e6b1c885e3adb99aa325282122bc37d84db0d83f SHA512 66f460077066372276783d8e7acefb0d61ae5fbf7e2d3bbb7008d9289a65adfe78eb8431eee4bbdd3f8e5a9e37653e396d659f46bb285edab00ed57277fae2c7
 EBUILD postgis-3.1.10.ebuild 3321 BLAKE2B ca5b7a050a14b8b8a751eebb492b4609912def389a52e3e5f71a8be7746ea2d81825928e5185b8322e67c09575577880002ad628790435c6874ee76b98ef08a4 SHA512 e73d968c83497857a6a647cdf1d6707b88ab38b8fd339d46d43690b2f935417c0b788d4a8e1a7227d912a6870c50a37737c9046dd4c0ffdf8660765e2b35baf8
@@ -24,6 +25,7 @@ EBUILD postgis-3.2.6.ebuild 3328 BLAKE2B c5fe60e00a1517d83f996b89a8a3b35e7aad8d1
 EBUILD postgis-3.3.2-r1.ebuild 3287 BLAKE2B af284a892ee0204fcc287b5dc25610c5b93614c69822140a5f83cd0d010a9a4e871c2ced6ae857272a0084efb54baaea95a64d859d5c128fc2fcdf1838f32619 SHA512 1c77890c523174a1c39a48bda25c8661a244374d3a76610f31d96d1be1b23ea1d45095ac51dc173a038ce11f1ccc2fc61ffcf679d7c02119aa987cbcade8b9e6
 EBUILD postgis-3.3.3.ebuild 3296 BLAKE2B 82ef1831438b395c6d2520be2bb2f78ea87a73ab59ec25645ffca624a79b1b77fe8f178f8cfff4b9260aadab08c8ea2ab5c7335761ccc4b0988672a2bbc8cb7e SHA512 a7bb9f40cc209e9a37004539f1912f8ae22be3e2e7b4bc48d7fd66924e7bfa5af66ada184c64dc3932e61e53dd2638a9c1c4eddd259867a834e3ea543b346d99
 EBUILD postgis-3.3.4.ebuild 3296 BLAKE2B 82ef1831438b395c6d2520be2bb2f78ea87a73ab59ec25645ffca624a79b1b77fe8f178f8cfff4b9260aadab08c8ea2ab5c7335761ccc4b0988672a2bbc8cb7e SHA512 a7bb9f40cc209e9a37004539f1912f8ae22be3e2e7b4bc48d7fd66924e7bfa5af66ada184c64dc3932e61e53dd2638a9c1c4eddd259867a834e3ea543b346d99
+EBUILD postgis-3.3.5.ebuild 3296 BLAKE2B 9ee7bc6c5fd40b41b437f1933e5c704e570e4ef9f925ffd9bee66b8c5bf89654b7253cc29526c2c2816abb70dfe2b699f99264d09d30470b7aa0d6b29878ab2f SHA512 27a7ba2ca4017a9472eba770790de921caa8e5d4cb216508dd2e906f9af39caf2c4c1704a66df176c777f463ae59d898e9734a1216cda49e518a63f0c46f5958
 EBUILD postgis-3.4.0-r1.ebuild 3303 BLAKE2B 53b5af82e5cd5b9a9ea84b841e6f1dfd26256c5551822352aec5b82f1c7846874111e1eb4b8349c89f006d73349305744db93fc788823bbc3f06e2ecd0e6eb6d SHA512 707951abc9a6a29d4a8ac4e18f141ca19fb08e0bfc003030645a255997745eb3bdb6a7142667de665f28ba2d52a051ef707c681995b74f03ca39d3fa90bd1b6d
 EBUILD postgis-3.4.0-r2.ebuild 3294 BLAKE2B f0c02c1ad6dfb5ec274d4eff1b38e57351c94d05a877f8e928bcf4126d025b092c460e8ce33708ad75e0034e95ed568c86886b4ea63f9d106609f99911141ece SHA512 acec537baac97d5d206960feb16eac89dbaebfcb057f99c4a4de16fa7a547bc3edf1ce5470c5f128b3f77a9590e82b99692f42ed9e83ca62cc385d074bbcfad8
 EBUILD postgis-3.4.1.ebuild 3294 BLAKE2B f0c02c1ad6dfb5ec274d4eff1b38e57351c94d05a877f8e928bcf4126d025b092c460e8ce33708ad75e0034e95ed568c86886b4ea63f9d106609f99911141ece SHA512 acec537baac97d5d206960feb16eac89dbaebfcb057f99c4a4de16fa7a547bc3edf1ce5470c5f128b3f77a9590e82b99692f42ed9e83ca62cc385d074bbcfad8
diff --git a/dev-db/postgis/postgis-3.3.5.ebuild b/dev-db/postgis/postgis-3.3.5.ebuild
new file mode 100644
index 000000000000..6f4f58e24ace
--- /dev/null
+++ b/dev-db/postgis/postgis-3.3.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( {11..16} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git"
+else
+	PGIS="$(ver_cut 1-2)"
+	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+	dev-libs/json-c:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf-c:=
+	>=sci-libs/geos-3.9.0
+	>=sci-libs/proj-4.9.0:=
+	>=sci-libs/gdal-1.10.0:=
+	address-standardizer? ( dev-libs/libpcre2 )
+	gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.5
+		dev-libs/libxslt
+		virtual/imagemagick-tools[png]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+	# source: https://github.com/google/flatbuffers/pull/7897
+	"${FILESDIR}/${PN}-3.3.2-flatbuffers-abseil-2023.patch" # bug 905378
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} = *9999* ]] ; then
+		source "${S}"/Version.config
+		PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+	fi
+
+	# These modules are built using the same *FLAGS that were used to build
+	# dev-db/postgresql. The right thing to do is to ignore the current
+	# *FLAGS settings.
+	QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+	# bug #775968
+	touch build-aux/ar-lib || die
+
+	local AT_M4DIR="macros"
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	export CPP=$(tc-getCPP)
+
+	local myeconfargs=(
+		$(use_with address-standardizer)
+		$(use_with gtk gui)
+		$(use_with topology)
+	)
+	postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C topology
+
+	if use doc ; then
+		postgres-multi_foreach emake comments
+		postgres-multi_foreach emake cheatsheets
+		postgres-multi_forbest emake -C doc html
+	fi
+}
+
+src_install() {
+	postgres-multi_foreach emake DESTDIR="${D}" install
+	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+	postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	if use doc ; then
+		postgres-multi_foreach emake DESTDIR="${D}" comments-install
+
+		docinto html
+		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+
+		docinto html/images
+		postgres-multi_forbest dodoc doc/html/images/*
+	fi
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	ebegin "Refreshing PostgreSQL symlinks"
+	postgresql-config update
+	eend $?
+
+	local base_uri="https://postgis.net/docs/manual-"
+	if [[ ${PV} = *9999* ]] ; then
+		base_uri+="dev"
+	else
+		base_uri+="${PGIS}"
+	fi
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}