gentoo resync : 25.03.2022

26 files changed, 575 insertions, 62 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 18d955c76b9f..20e3a917f172 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index 3640a6687222..4cec062c2b3a 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -1,8 +1,10 @@
 AUX mysql-super-smack-1.2.destdir.patch 420 BLAKE2B be3b49d142a32f6ed00edbd6085d20f202f1d3061ad2e1463f2ea7be434ae1114bd9b776a03840ae9e4baff209b43a25b089a0e3863181273146e462dfcb3e7c SHA512 9319fb29af0e91bedc969a0c5f02bcac386274aa179af7ef3130b18ac9bfa36a0a422a76e50abb777323cac242283c1b680051689a6269ab7e567b5ae53a216b
 AUX mysql-super-smack-1.3-automake-1.13.patch 7680 BLAKE2B 99a28b7c857575b8e824d0e3f5ae87668a47e1e234315ad3657c5e388051164bcc03cadc9f80d9eac82f2b4f79864a595944a2ec896885b52044264ca3529755 SHA512 b74994f03b136c7642423ee5eb1346134ed127a9ca0996df83ed777f49f9dff3efe93889bc3a375868afec38be20303ffbede98dcfd3b6ec5921f0e417b5a000
+AUX mysql-super-smack-1.3-autotools.patch 6988 BLAKE2B aaf6d8cedd4a01f2f11cd80b953ea6787fa2e218ee452b009e49c1e16b05f3548072f0e65a6eed6effbcb29c65f8d576181b30e7f503242f4b0d835e79020be1 SHA512 9aa29299b945b84e6979c0c9f0184c7e0ffafdcb63ead926b05a11c3f12f6e88b1bd3157e24c6623da26bc5d5d2a5eeb20c0870286db2b4708981c9b3a27c8d3
 AUX mysql-super-smack-1.3-gen-data.patch 2265 BLAKE2B 42f85a5779968d13262ddf3b726d4522912bc29c4d81fce41fe61caeab85c7fa93be5c3497dc21a0acabc67e59446cc941deb6fb98ac2154cf7f84214b500ff6 SHA512 6a08a3ccc158e7c8e0500a8d3231d0b1fc0d0f4a41e2a5bf40426e480c6fc373b0fa7ff5c08b5d40afe559a34b97fd00412c43fe9212047f2c4d063b98ac2154
 AUX mysql-super-smack-1.3.amd64.patch 702 BLAKE2B e986f6c487d05c9de0ee3f3a397a2c63d21c05209efc48e8fa173975b88839baa6100150d0cdd6df42b7435cc8a411b5235cf92a586850ae3d57cb564a8b95a8 SHA512 5ac9c130534d5cea6caa70f6373850181ae81c68c1eb3cb9e7a774bdeeafdf822582fe9cb548b9eb1268a2b4edc516461b95238454abefcdd25677066d720da9
 AUX mysql-super-smack-1.3.gcc4.3.patch 241 BLAKE2B 5f7dae8deb353e6129cedc5a085b933928caf3731b3ad673a56366886ece5cd8b60fdc78657bc3b0925dd171fbeba7e6df24261524efbc6f40ef9b473a11cf9f SHA512 500d8e7ee919b5359b14d22a2e9d26c0ed8cd0936376cd5179be3a92f99c753dd4b3a6cdee417468721a60aa727e09763aff64ce055e43c7ccd52b4937aaff30
 DIST super-smack-1.3.tar.gz 155375 BLAKE2B aabcd6ab6c7da0e847c734bd57b7228a0c37f41aac789e63a8285b5a0fb43360101728ff6a2dc84b63cf9c0b5361770aa909382f9e2f50abdc2ea1e8407f835b SHA512 5343fa78bdf483c1019c9e25d1fdb15581342d49b863a536eb1cf8c38bde5641fdf135fe5a8ec87f74051fd9766b2f5e4f09f963afe2eb1cd7ea41edfa260920
 EBUILD mysql-super-smack-1.3-r4.ebuild 1654 BLAKE2B 3650bff6eae5f0e512f9971b6b8ce99c16fdf8068aba0c83d8de264e1561c319ac7f433741fb5b08d31569ec16615d6b58c2d73685dcd814b9db3d636f26ac68 SHA512 f5b78b4d4a81d6d6b7bf75d05bdb555f4ec59ecf594cb5706f11c2ae24f8760c43d87c43c9b18e4f8bbf08de0b08f629ce81fa95567030952f356ab5306730ed
-MISC metadata.xml 319 BLAKE2B 101e797ba4616414281cfd6869070b696b224aabfa5fdc6215f6d4597133a67b9db84d3f246cad312dc4c3b4323a921f8887df4abe7993e32c14cf6912614499 SHA512 6585f781b8d569fd1bb926dc0cbd4350b5a6e2cb0640c2523ed3483276c8d4b411ddeff7f7f3e9a4363551a3a8910a5e32bb075f25c545275c83ce92a90c49dc
+EBUILD mysql-super-smack-1.3-r5.ebuild 1533 BLAKE2B a38d6249753a8b8027465b0d960616a6729d3680d198a6e7f8d8d6d606655242137db2b428421ef48de0d7d32007800e296549929627e207ff8cdd8e2c84944f SHA512 edd555b3037c6019a75c29dde46c0215d1ad65d23646c3e180f37669166cce3cca8e5765ada984686fff52027cc7308d42b739e42a6c82a6693ee5b3fc01c00c
+MISC metadata.xml 323 BLAKE2B 9b0447d87c9b774dd35df6f600a65277fa0ff42abaae9abcbdf8cfef461feba9b1d333699d5a210799ee1f5408e1fe7e47faababa5ff63ebcb5833ac68349964 SHA512 d0c11eddb2bd8b7c1d8dc0b30cf6d5f9bf990e5f2846caae2960f973ca9896f5c37049ba1dd95397347fe02c4b8a1a167c88b71f19ff3ee9c27b2ff6d587aa40
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
new file mode 100644
index 000000000000..97e1e1aaccc6
--- /dev/null
+++ b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
@@ -0,0 +1,255 @@
+--- a/configure.in
++++ b/configure.in
+@@ -16,9 +16,9 @@
+ 
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT()
++AC_INIT([super-smack], [1.1])
+ AM_CONFIG_HEADER(config.h)
+-AM_INIT_AUTOMAKE(super-smack, 1.1)
++AM_INIT_AUTOMAKE
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+ 
+ # Checks for programs.
+@@ -31,6 +31,14 @@
+ AM_PROG_LEX
+ AC_PROG_YACC
+ 
++AH_TEMPLATE([HAVE_CRYPT], [Define if we have a crypt()])
++AH_TEMPLATE([HAVE_MYSQL], [MySQL Support])
++AH_TEMPLATE([HAVE_ORACLE], [PostgreSQL Support])
++AH_TEMPLATE([HAVE_PGSQL], [Oracle Support])
++AH_TEMPLATE([SMACK_DATADIR], [Sample .smack data files])
++
++AC_CONFIG_MACRO_DIRS([m4])
++
+ # get super-smack datadir
+ AC_ARG_WITH(datadir,
+ [  --with-datadir=DIR      Specify default smack datadir],
+diff -aurwN a/m4/crypt.m4 b/m4/crypt.m4
+--- a/m4/crypt.m4
++++ b/m4/crypt.m4
+@@ -0,0 +1,5 @@
++AC_DEFUN([AC_FUNC_CRYPT], [
++    AC_CHECK_LIB(crypt, crypt)
++    AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
++])
++
+diff -aruwN a/m4/lex.m4 b/m4/lex.m4
+--- a/m4/lex.m4
++++ b/m4/lex.m4
+@@ -0,0 +1,6 @@
++AC_DEFUN([AM_PROG_LEX],
++[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
++AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
++AC_PROG_LEX
++AC_DECL_YYTEXT])
++
+diff -aurwN a/m4/libz.m4 b/m4/libz.m4
+--- a/m4/libz.m4
++++ b/m4/libz.m4
+@@ -0,0 +1,4 @@
++AC_DEFUN([AC_LIB_Z], [
++    AC_CHECK_LIB(z, compress)
++])
++
+diff -aurwN a/m4/mysql.m4 b/m4/mysql.m4
+--- a/m4/mysql.m4
++++ b/m4/mysql.m4
+@@ -0,0 +1,76 @@
++#serial 1
++AC_DEFUN([AC_LIB_MYSQL], [
++    AC_ARG_WITH(mysql-lib,
++    [  --with-mysql-lib=DIR    Look for MySQL client library in DIR],
++    mysql_lib=$withval, mysql_lib="")
++
++    if test "x$want_mysql" = "xyes"
++    then
++        AC_MSG_CHECKING([for libmysqlclient])
++        AC_MSG_RESULT()
++
++        mysql_ok=no
++
++        SAVE_LIBS=$LIBS
++
++        mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \
++                   /usr/local/lib /usr/local/lib/mysql \
++                   /usr/local/mysql/lib"
++
++        for dir in $mysql_lib; do
++            if test "x$mysql_found" != "xyes"
++            then
++                if test -f "$dir/libmysqlclient.so" ;
++                then
++                    LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
++                    MYSQL_LIB="-L$dir -lmysqlclient $LIBZ_LIB"
++                    AC_SUBST(MYSQL_LIB)
++                    AC_CHECK_LIB(mysqlclient, mysql_real_connect,
++                                 mysql_ok=yes, mysql_ok=no)
++                fi
++            fi
++        done
++
++        if test "x$mysql_ok" != "xyes"
++        then
++            AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib'])
++        fi
++    fi
++])
++
++AC_DEFUN([AC_HEADER_MYSQL], [
++    AC_ARG_WITH(mysql-include,
++    [  --with-mysql-include=DIR
++                          Look for MySQL include files in DIR],
++    mysql_include=$withval, mysql_include="")
++
++    if test "x$want_mysql" = "xyes"
++    then
++        AC_MSG_CHECKING([for mysql.h])
++        AC_MSG_RESULT()
++
++        mysql_found=no
++
++        mysql_include="$mysql_include /usr/include /usr/include/mysql \
++                       /usr/local/include /usr/local/include/mysql \
++                       /usr/local/mysql/include"
++
++        for dir in $mysql_include; do
++            if test "x$mysql_found" != "xyes"
++            then
++                if test -f "$dir/mysql.h"
++                then
++                    MYSQL_INCLUDE="-I$dir"
++                    AC_SUBST(MYSQL_INCLUDE)
++                    mysql_found=yes
++                fi
++            fi
++        done
++
++        if test "x$mysql_found" != "xyes"
++        then
++            AC_MSG_ERROR([Could not find mysql.h in '$mysql_include'])
++        fi
++    fi
++])
++
+diff -aurwN a/m4/oracle.m4 b/m4/oracle.m4
+--- a/m4/oracle.m4
++++ b/m4/oracle.m4
+@@ -0,0 +1,10 @@
++AC_DEFUN([AC_LIB_ORACLE], [
++    ORACLE_LIB=""
++    AC_SUBST(ORACLE_LIB)
++])
++
++AC_DEFUN([AC_HEADER_ORACLE], [
++    ORACLE_INCLUDE=""
++    AC_SUBST(ORACLE_INCLUDE)
++])
++
+diff -aurwN a/m4/postgresql.m4 b/m4/postgresql.m4
+--- a/m4/postgresql.m4
++++ b/m4/postgresql.m4
+@@ -0,0 +1,75 @@
++AC_DEFUN([AC_LIB_PGSQL], [
++    AC_ARG_WITH(pgsql-lib,
++    [  --with-pgsql-lib=DIR    Look for PostgreSQL client library in DIR],
++    pgsql_lib=$withval, pgsql_lib="")
++
++    if test "x$want_pgsql" = "xyes"
++    then
++        AC_MSG_CHECKING([for libpq])
++        AC_MSG_RESULT()
++
++        pgsql_ok=no
++
++        SAVE_LIBS=$LIBS
++
++        pgsql_lib="$pgsql_lib /usr/lib /usr/lib/pgsql \
++                   /usr/local/lib /usr/local/lib/pgsql \
++                   /usr/local/pgsql/lib"
++
++        for dir in $pgsql_lib; do
++            if test "x$pgsql_found" != "xyes"
++            then
++                if test -f "$dir/libpq.so"
++                then
++                    LIBS="-L$dir $SAVE_LIBS"
++                    PGSQL_LIB="-L$dir -lpq"
++                    AC_SUBST(PGSQL_LIB)
++                    AC_CHECK_LIB(pq, PQconnectdb,
++                                 pgsql_ok=yes, pgsql_ok=no)
++                fi
++            fi
++        done
++
++        if test "x$pgsql_ok" != "xyes"
++        then
++            AC_MSG_ERROR([Could not find libpq in '$pgsql_lib'])
++        fi
++    fi
++])
++
++AC_DEFUN([AC_HEADER_PGSQL], [
++    AC_ARG_WITH(pgsql-include,
++    [  --with-pgsql-include=DIR
++                          Look for PostgreSQL include files in DIR],
++    pgsql_include=$withval, pgsql_include="")
++
++    if test "x$want_pgsql" = "xyes"
++    then
++        AC_MSG_CHECKING([for libpq-fe.h])
++        AC_MSG_RESULT()
++
++        pgsql_found=no
++
++        pgsql_include="$pgsql_include /usr/include /usr/include/pgsql \
++                       /usr/local/include /usr/local/include/pgsql \
++                       /usr/local/pgsql/include"
++
++        for dir in $pgsql_include; do
++            if test "x$pgsql_found" != "xyes"
++            then
++                if test -f "$dir/libpq-fe.h"
++                then
++                    PGSQL_INCLUDE="-I$dir"
++                    AC_SUBST(PGSQL_INCLUDE)
++                    pgsql_found=yes
++                fi
++            fi
++        done
++
++        if test "x$pgsql_found" != "xyes"
++        then
++            AC_MSG_ERROR([Could not find libpq-fe.h in '$pgsql_include'])
++        fi
++    fi
++])
++
+diff -aurwN a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,7 +16,8 @@
+ 
+ # Process this file with automake to create Makefile.in
+ 
+-INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
++AM_CPPFLAGS = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
++BUILT_SOURCES = super-smack-yacc.hh
+ 
+ noinst_PROGRAMS=test-dictionary test-client test_tcp_client
+ bin_PROGRAMS=super-smack super-smack-gen-data
+diff -aurN a/src/super-smack-lex.ll b/src/super-smack-lex.ll
+--- a/src/super-smack-lex.ll
++++ b/src/super-smack-lex.ll
+@@ -6,7 +6,7 @@
+   #include <ctype.h>
+   #include "query.h"
+   #include "parse.h"
+-  #include "super-smack-yacc.h"
++  #include "super-smack-yacc.hh"
+ 
+   static string q_str = "";
+ %}
+
diff --git a/dev-db/mysql-super-smack/metadata.xml b/dev-db/mysql-super-smack/metadata.xml
index ee3ef09ebf87..80c2abfd5594 100644
--- a/dev-db/mysql-super-smack/metadata.xml
+++ b/dev-db/mysql-super-smack/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person"><email>robbat2@gentoo.org</email></maintainer>
-<maintainer type="project">
-<email>mysql-bugs@gentoo.org</email>
-<name>MySQL</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
new file mode 100644
index 000000000000..e47e1a187676
--- /dev/null
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="super-smack-${PV}"
+
+DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
+HOMEPAGE="http://vegan.net/tony/supersmack/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	sys-libs/zlib:=
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:*[server] )"
+RDEPEND="
+	${DEPEND}
+	mysql? ( virtual/mysql )"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.destdir.patch
+	"${FILESDIR}"/${PN}-1.3.amd64.patch
+	"${FILESDIR}"/${PN}-1.3.gcc4.3.patch
+	"${FILESDIR}"/${PN}-1.3-gen-data.patch
+	"${FILESDIR}"/${PN}-1.3-autotools.patch
+)
+
+src_prepare() {
+	default
+	# Clean up files so eautoreconf does not pick up any
+	# deprecated autotools macros.
+	rm acinclude.m4 aclocal.m4 acconfig.h config.status config.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=gnu++98
+
+	local myeconfargs=(
+		$(usev mysql --with-mysql)
+		$(usev postgres --with-pgsql)
+		--with-datadir="${EPREFIX}"/var/tmp/super-smack
+		--with-smacks-dir="${EPREFIX}"/usr/share/super-smack
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc MANUAL TUTORIAL
+
+	keepdir /var/tmp/super-smack
+}
+
+pkg_postinst() {
+	elog "The gen-data binary is now installed as super-smack-gen-data"
+}
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index f294f92779d5..5c6f881355f6 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -4,5 +4,5 @@ DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1
 DIST mysql-workbench-community-8.0.26-src.tar.gz 19282576 BLAKE2B 4b05d42a10ad3cc88d6447ff5ed1344ac8ef75564e2b69a55f603930f3ff75cd9ac00fd82b6b7339bdbf9524a593fadc32070c6cb5f77e9eeb6ad8e24cc59e7c SHA512 33b28b74b5c7d75c7b3c017cdebc48f3453d0aed2e8ebb20052e462479d0147e164d409e040ab8d1828c2209ad3bc41ab9684e91f86769bf7c1fa0ee117e888c
 DIST mysql-workbench-community-8.0.27-src.tar.gz 19282580 BLAKE2B 53069dbf26f1ba5975a9b28cf96cae660db8654dd60e5f7cdf112db48e7d4fd41beeb74a9ff870ae38b2d651de4ed7edffec32ba3eb8914bb329ff414ec7e7d4 SHA512 827d7abb8e04b0ec4a730eac163b4e2b62f5cde25d7326b4cb95b5f924b1e7c5bc87b1a8ca64dbab59232f4dd042b41cb1e53b97a9484549d0d6c2b7c8a14741
 EBUILD mysql-workbench-8.0.26-r1.ebuild 2773 BLAKE2B 79bf4e4144cb9d7704c93290eca97185b78ecec676fef873644305c307ce22e63245e4460e0849db417114c64b9579c03e316fda9c06b74a8fd33ab981b2d1a2 SHA512 5483b9ce7bf2746957451710e89f19de915d2a82c437982d27c5c7d8d190c7050e906b130171830f49a08d7348ec1bcf5eb8bd77a1dc42a4d5f8fe0e370dca05
-EBUILD mysql-workbench-8.0.27.ebuild 2774 BLAKE2B 83c0cbe225d039d7bc8db06db454a304c250df7e1746c35040d4e082af94c428b2bc05d41ed85c8f6aec27818b3e5db292e1b7c812ef886ee98aa3813f5d0f82 SHA512 1d0729aae221c90da2284ba94e87780fe1126f060b39fea4a0327261db483f9a68b329cee0676eb5b477cad06bdbe11103800434fe0ceb5680bb834909611815
+EBUILD mysql-workbench-8.0.27.ebuild 2773 BLAKE2B 606596a3bccd80135395a6edf53bf2e645c10de8fd4af99465dc8f2937e1f3c21857f4efef899c39fa6e06d76bb5c7eb592f249753b1a6d3a05454c1d49d43af SHA512 9909e2a199c7c6f1e9fc8f3ed7b7f9227403bdbe71bfb6ce42eb9344b1e00271396dcbd62382cc4c3d121c67154ad3b9011e025347c60065756180f718a49d58
 MISC metadata.xml 311 BLAKE2B 78ae228a5e7307e8ed03ddab6b38d288bb7811f0a04d460fa13096fd8350b9b097dffcc1fb8e7f173834d49c108e482b8c8fc6ba65ffbaf6697c4e7075167ccd SHA512 72243543b91ee6b5560444cb1082dac192e2b17b5746e52b92076b483e14ced459ac54fad595307a6e7b53f48d1466d81b1ea4c1829d128f7b977fae87a176cc
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
index 6ce9aed7c684..273419842bc6 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index a020a9ec2a47..35c5bda6e74a 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -6,6 +6,6 @@ DIST percona-server-8.0.25-15.tar.gz 531072362 BLAKE2B aa6867a8ac72325596393723c
 DIST percona-server-8.0.25.15-patches-01.tar.xz 7624 BLAKE2B b06495859f3df546bc42e69ec77007a335103020313524ed728309764fea8ca2ea6f246938852ab2fb5ea12b4d901af5ebb9abff4d99b7e56d6ffd501d10bd38 SHA512 69b2d478046666d7c5dbffe662f4e000fd1c2c8789bcaeea72b8bb229ad85d8cd54a293c74440f93c56dc07a06143553ff989711787e6cd610a8e23bb353a1df
 DIST percona-server-8.0.26-16.tar.gz 532328971 BLAKE2B bef32f7a26261f3b0d89bd9b95b826101e2e84c662ce2200a2d9d8a612d949804d233905db71bfab5aa04458e7773231659d67ea09e08e68df8ef5eca4391f39 SHA512 9ae60e2d81dfaabc214692cd0919c2fc3ba698bd0a399e42df662766c1d67714f6f3cfe6416019b26e7866bc59b78d99fc5767f64ede1ca8e5a344995c1ff4c0
 DIST percona-server-8.0.26.16-patches-01.tar.xz 8144 BLAKE2B 28a4eaec657c09a6f8290b654dd5316d44a4cbf94e418edee3754742f21df56a058de9332c15abbb7c8bbd3ed6fc63e48e6c5fa77524dccf44ff1d5a89085a6b SHA512 4a128a89abc1f48582b0c6ab841643fa0b7e018eaa32414e775705cd1e8c2dcacecd334face9db33775ca3a2a862528e1cc7f2bfd8b259b7367f0f2ebdee52c4
-EBUILD percona-server-8.0.25.15.ebuild 42717 BLAKE2B e7067ee46740fc6c40cbee53fe4ac5bc602eebec871e07bea21c64beab3a053923afaed3ee1c3f74c13885245337e410c108055dcbb3c5c358c22bfb2ddb1cac SHA512 5676a89d5b5d925132fdb3b9cdd15c334476076f231f267667f11d0df7fdf9de650a614fef2afc1e4a08f2463fdb398c0c2b5207b41a83a0b79901bbc501d550
-EBUILD percona-server-8.0.26.16.ebuild 42897 BLAKE2B ace80127ce9448e1ba3772dcca7fefd85a96e14b96d3811d3705fee4cd719917d5975f6dcc43b8ff2e617bfc20d2ebed3c482b93d8a1324c3a24eaf06f847355 SHA512 0d718b32128c5a1067226b41ff4cf31c9fa29f40ecd7ca7c933d16019495ab2d5555a88a4b4c82d4f1b90b2073d9032558b84c63b58d286ce4d1fbe70a9610d1
+EBUILD percona-server-8.0.25.15-r1.ebuild 42774 BLAKE2B aa76031b06b60df189df39d4246839a782dbe99af24b0d4f7032b0a70ffba4917c0f9609aff50487b798e43b919dfeb0132186767c3c6b76034af6bebfa32d57 SHA512 d2460e2c893de9110b1b73c0ad224e708aed5aeb6ea77f654a5c1d5b3ee1dc624ab7d6087ed08bfe0b1538ad73e3b3c9db51756cc45c869194a057084a7b3baf
+EBUILD percona-server-8.0.26.16-r1.ebuild 42954 BLAKE2B 51dbe6e6e8be119ffbca5ec2ed41a90765a4ffd09e716fd785381d3e90ac5ac61de1359e9cc4c66e4e389faa012b5df1986d088e805108f186ed667adb79d555 SHA512 26345d4f08ddb975660e1fec3b4ec6ce29b0c0503e3c1367540c54687f89e41f0304a0adcca31f8e10f57fb95d980135e48fb3dbd7d4b3b6b12527d719574066
 MISC metadata.xml 1011 BLAKE2B 59166664921919352aa3bd37c1b8b8e9f5fe142698db249105908afd61f4747ddcbffa3a7f22869381126cbb9f609eebde2d103b0dc283410cbbc6fa67a4964c SHA512 aef0bef1758e147e1a7120d5147388501efe7d3bc56dcb464521fcff8ee99052213415c2388b19aa4d4252120f9e56f1edfacd5cd8ced8bcec5422b8e7df282c
diff --git a/dev-db/percona-server/percona-server-8.0.25.15.ebuild b/dev-db/percona-server/percona-server-8.0.25.15-r1.ebuild
index a6db5af0b52e..1960a9053c03 100644
--- a/dev-db/percona-server/percona-server-8.0.25.15.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.25.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -49,6 +49,7 @@ S="${WORKDIR}/mysql"
 
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
+# openldap < dep for bug #835647 (we need ldap_r)
 COMMON_DEPEND="
 	>=app-arch/lz4-0_p131:=
 	app-arch/zstd:=
@@ -64,7 +65,7 @@ COMMON_DEPEND="
 		cjk? ( app-text/mecab:= )
 		ldap? (
 			dev-libs/cyrus-sasl
-			net-nds/openldap
+			<net-nds/openldap-2.6:=
 		)
 		jemalloc? ( dev-libs/jemalloc:0= )
 		kernel_linux? (
diff --git a/dev-db/percona-server/percona-server-8.0.26.16.ebuild b/dev-db/percona-server/percona-server-8.0.26.16-r1.ebuild
index 9098b344ce11..6264df78a218 100644
--- a/dev-db/percona-server/percona-server-8.0.26.16.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.26.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -49,6 +49,7 @@ S="${WORKDIR}/mysql"
 
 # Be warned, *DEPEND are version-dependant
 # These are used for both runtime and compiletime
+# openldap < dep for bug #835647 (we need ldap_r)
 COMMON_DEPEND="
 	>=app-arch/lz4-0_p131:=
 	app-arch/zstd:=
@@ -64,7 +65,7 @@ COMMON_DEPEND="
 		cjk? ( app-text/mecab:= )
 		ldap? (
 			dev-libs/cyrus-sasl
-			net-nds/openldap
+			<net-nds/openldap-2.6:=
 		)
 		jemalloc? ( dev-libs/jemalloc:0= )
 		kernel_linux? (
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index f113ef9f0c4a..2c1c095c76f7 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -3,6 +3,6 @@ DIST pgtap-1.1.0.zip 306590 BLAKE2B efde91e26fafc8300fa39b80d90eef134ebf3a309fca
 DIST pgtap-1.2.0.zip 319374 BLAKE2B 1cea77860a1928ed7cbf4ddb0bb8ff418023bf88e377196ae2b505c065321e3003179227077567e676a8c551230d259ecd1cdb590001fc71bcc821b87fb3d0f6 SHA512 5569bea5e7879787a91fa9b2baae5cbff1db5b9a5a096db2a9a064012d65e02c52bd1520422b5e6f87fb5b6e64845371188ea53c43a277aee68ffc05d5152ed7
 EBUILD pgtap-0.99.0.ebuild 584 BLAKE2B d50187a368d9a9485183a2a3dc9f23aef3fdc9b4f304f7b01eb4b5da1649ca19fb2c9fe60fa4dfc968153946da1e8457b650f7e67a343e402114df02ce9a324c SHA512 e8b2bfbe1fd3bc012dc7b87d92ebc7c7f026296c4c09881255225f648a6540f2c092580ea351d9f780672db61cf4195cf35c2285ca2b6a58cdf3c5c32536d278
 EBUILD pgtap-1.1.0.ebuild 638 BLAKE2B 1c44e86675592fbbef365d8aec2194c83dfdd0e56dd175159eb77bc3ba5a3ce904af9e149cc385cbeedc9847e656c7d8276dc329d09a654edaece1a224182a2b SHA512 c6f7b1c68c3be187b9f7332794cdc51a08bc6507aa9e530aa1bf302869fd0f69c9ef08092bb23d52eba368963ead74bedca374e9d2a3b36b26479977a9d4ed39
-EBUILD pgtap-1.2.0-r1.ebuild 776 BLAKE2B f7f35bb8ce49aa3af59de0cd58b742de118f8c72b4ea4297aa7303d609a660661238e9948f4cf5474fc90a25402b3d444c11b087ef5fe4e97213bc6a73b808fe SHA512 591ec6c2d26986fdc5579ae95f48b8a75524422ba68a8c1bc35d8cd0d3acd3f9f65ca0fd653b17574f724db5335d1cba1375293d1ec1d3eb29002765b81dd6cb
+EBUILD pgtap-1.2.0-r2.ebuild 795 BLAKE2B 1f43593a1e5c1e448f3a8fe6bcd2d4de8d4596294d1203fb75c79e3e1bed03d430ed22d1bbb4e19f492a5d30b4dbbb1d55830802f4ce37b3a54b3fa8dfc40eb7 SHA512 e951c154f9571219aab874b79478732a6fa704170adb803406986711c94e080e31a2319694bc149db6d967ae95ee827e872078fd225d51a5657d75ddea2e3c55
 EBUILD pgtap-1.2.0.ebuild 638 BLAKE2B ee4f80c5bc1891454996ca3a5572b66bbf5816b503eba567210527683691d8a08d67f6eef73f568dd2df98368d30bfc650e10e6219025cd3c88d7c5ac92f127e SHA512 087436540027476c4958df8536c34d00d1c8c8bcfe629bb158f22d342858c7a0342c1695e705a161e52521407bbfe522f24650f180561c6ac4bcf13bb135a699
 MISC metadata.xml 629 BLAKE2B e7052e443d1a9c728bce35231d7aa287b2844409cc69ecb42b563000a7908e1db49d1a85fe01e8bcafb27fc2741181869895582a77286a0eb16b101ca672d3c4 SHA512 9a3f6c41f8a6577b0c2e29d81549644cf2c74f742aa3f4fca182e6588cc380ac3d2fa5ca07b931d41b24ba0021b81f462d316071ecaa1c3d813cbfa76603f063
diff --git a/dev-db/pgtap/pgtap-1.2.0-r1.ebuild b/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
index 747da8ca2c29..c622db920eb2 100644
--- a/dev-db/pgtap/pgtap-1.2.0-r1.ebuild
+++ b/dev-db/pgtap/pgtap-1.2.0-r2.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 }
 
 src_install() {
-	default
+	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/postgresql/Manifest b/dev-db/postgresql/Manifest
index 708c44aa562e..b26aeeaa1b46 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,3 +1,4 @@
+AUX postgres-llvm14.patch 4963 BLAKE2B 66e50d40cd9491ef1757d9b5756b07af683e98d8a6b3e808f90699745b6a772f921695d1528d9d486240690b2efb55b39a184032e205b857609d27430cd6eb9f SHA512 c74841faa6120450481dccc94af3700313c389494e8adacc02ab1d655592dac08e97e6828452140b901548af58f857e3290650c3318c86f9e63d3c5a8ae90fc5
 AUX postgresql-10.0-icu68.patch 606 BLAKE2B ebe222879ddd0e97da8762ad85994beced0d706d2db140db9b3e588951f485763f698d70a8ff4e4bbfe1d66f8762bf3d329bc97aaa70bf5b36f0e2e72e53a508 SHA512 1c3c994c79155845d6b3d1a92df002d4127fc576eb837f892aef0ba2e0b914d107c35656f9e5946084892693054cb935e85eb5902be2296fd04c7cf958ba98ea
 AUX postgresql-10.2-no-server.patch 3117 BLAKE2B 399e295e393aa84aeaefbe236bf63e091414c9f3d9238ef8f4af3ec955cc0ded6324f4241ee4e78ee1aa775524768f65b15d5064cf4330f5b3149bed2e13aad3 SHA512 1888985a0fa67241b18d3c21c1ededc34666c55f6f4f3806efbe4dcb5a2e30d6d08c955a3bbcc52f589bc5bb857d1c09bd82b555069637a71afe9062994199fd
 AUX postgresql-11_beta1-no-server.patch 3080 BLAKE2B 29d4f5d8e26e9360490876d2d51cb29cc340128fe77c0bd76248073157c9e5be09c788cc4344e09c0c2bf2f57e274d5f31f211d1950ee3f47660dfdc4cb7b455 SHA512 42c39e602a019d1d44c39795904fb37a7f14b4623fa90b066f4f26a743d80b6eeaef2e8c7de4c47dddf53d7e89cbe5a2a3473b456ddc76fc0e96f57ff6a9df69
@@ -22,16 +23,16 @@ DIST postgresql-13.6.tar.bz2 21257213 BLAKE2B f5ea95fd9ffc8846e0aaf5bac03b02afa7
 DIST postgresql-14.1.tar.bz2 21887101 BLAKE2B a496dfd513c52339d1b3cb72773f9611721fd7c5d2a702d6fd71f650a1d41c3d7bf6574eba23671c7f9f11718e007f51f9547949bdc3d7fe1ea2248ebfb8d70b SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd
 DIST postgresql-14.2.tar.bz2 21964841 BLAKE2B 6460533a40064404f18642147b949cf7c85d036c45ede478fb9af8919895ee7b09dc78b89ed08a292226911f07cfc9e46d7f2d42e0aaea546c5e97a291d599b9 SHA512 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b
 DIST postgresql-9.6.24.tar.bz2 19047518 BLAKE2B 63b53cfb2c9381fe09ed76ef3cad1ec5014bcd3b4dea388cda5b4ad8b8084abc15a38dcd62e0c3fe0bcc922749e7a4bef4ec39287c4b1ea952b8245bbc72bc2e SHA512 c17ef8e7149bd136f6058e20b28f9a7307625614e37ff837feb7a6fa37b6932dfab6379285120c9bb0198961eb446c9979d5ee1f3e8583b09f981f52bee33505
-EBUILD postgresql-10.19.ebuild 13406 BLAKE2B 8b13ef233f11306debff7e81c00a1e222cf98a817dbfad8b06bcaf1c85b0d7c50b0f1089aa8057f58c69cc4444aaf7f5f6a7bca8ae903305aa871b172176d1b6 SHA512 1f2751c8e56ecceb98eebdcd47d93d6a4359a0302cbe346557deb610f6ac96b4744fd878bd37ab49f893ebd55c0eba2ea646209f4498fb7ea3d6ae717d0a33be
-EBUILD postgresql-10.20.ebuild 13414 BLAKE2B 1359953281cdabefa0b62dab1977771a0b1b6ec3b66428ae3d45ffab4c68c538de931c6c79f669c016ebd8c4ce540752aee54d195c918556dac8fdb3128f4997 SHA512 bfa7410311d6ec57f2d0c2af84034e45d339843c4e008d8ab972347c7ba4ca98fcab1116ad1a5877986269fb4de373043f265a77a8bb51e31e7c20f7bada5a99
-EBUILD postgresql-11.14.ebuild 13388 BLAKE2B c48815de53abe5328a03c1d427fb63b1f4b48d15defcd7e10b86b2e55247839d2e6f8a27ec6fc73eda4701240d950c14d8896f031139725776356a72af3a9791 SHA512 dd7210480b744b38e66329057b55a4051921d0603a859c6cfb251285e35cf038f08944e033eb3ef741448c2bfd3e6916df69547b04ae35d5e8fada11a98b1b86
-EBUILD postgresql-11.15.ebuild 13396 BLAKE2B ee8e0c4ae7aff0ffb7ba1d307c723136921e401dd22541cf70da85a0dd2fdcbd7e187bbe33b08a81ca9a6649eb68291c6356f70d6d9ee68a8c22015c26ba4770 SHA512 8d4db523440b61897923b761e72df70b21e69b11d119d13859c3f2c64bd7441ffd7741134227f45905c30eb3eaa3c6d8822bb572fbf645fa21506c4990799ff3
-EBUILD postgresql-12.10.ebuild 13368 BLAKE2B e8cbcad7b27990e0368e5091aeea8486865e98413222522aa72cd657259c0afc44eadd98a9f2e4e41be4b0d7899fd09a1731acfb3f4c5803818c7d3a4564ffd5 SHA512 c8a07b12e39b0a0a220dfc8e3ec808073be54ef3b0be299acd8353316ba88e827c640779c0a66973057c7d88f5d9ad811480bfb7f33d589d1c934f59580b4c43
-EBUILD postgresql-12.9.ebuild 13360 BLAKE2B 995ab8160f9efd010777423d968e36482458f206e810900f2621724cefb8db1cbd9bab7a89aa68b79d23be163cab4f1a11dbbc982f804c2ac12a1f1dce464f0e SHA512 f486c23e4e34b1de2a768f3b9745982003a8b84c4d0f2e19dd9cb3d48c70144b435315e787c8e77c80da8c1e17ccb9a9d4da09f7cd0a36e81e7892b21e08664e
-EBUILD postgresql-13.5.ebuild 13798 BLAKE2B f8b94f053f91d1fda023233f0b1f302af553448b3f5543a7020f9f7f05e072914d25667c6ca5903601e06d98b0ca9586c14ba275d531b4d8c9b5638ef9b15e41 SHA512 9b8fd5caadfab9e0a15733e782b3d4ab3852e446e9ea6c28aa50adac14a6f716630cf101e0ad15fb4983a91ddeec02df0b025b92e0070be0d51a2af8d728499f
-EBUILD postgresql-13.6.ebuild 13806 BLAKE2B ca2671a77d6b1fcade98d12fe277101d85739d4251a38fe71450908b3875a036b136d838170585a5ee5435900bfe601d5ff1622447ef89f1ff1cc215507e47d9 SHA512 c56bda1468d427bec5745405016a4bebff76e2d9c7eb0d31ee36228a418739144f1ffb337d76974f5e1973d13c8164073eef9d2d363edc4984580685f2cbabc7
-EBUILD postgresql-14.1.ebuild 13794 BLAKE2B 3a99312b8f728e49f10bfe8d174fd6e8a8e7bee887fa51b7a9235253503ed331f8599046af1d479f2c8a497fc54ef71c74e0dfddffebe79b1980fea0d8f09626 SHA512 8811c1715f245ca8eec52e2e837a49cb40dafb760e5203d9008db8bd50e2f23bacdcaa3c901e58d4a7998eeccd9145b91d4f41285952abb14c24c3eee0d53823
-EBUILD postgresql-14.2.ebuild 13794 BLAKE2B 3a99312b8f728e49f10bfe8d174fd6e8a8e7bee887fa51b7a9235253503ed331f8599046af1d479f2c8a497fc54ef71c74e0dfddffebe79b1980fea0d8f09626 SHA512 8811c1715f245ca8eec52e2e837a49cb40dafb760e5203d9008db8bd50e2f23bacdcaa3c901e58d4a7998eeccd9145b91d4f41285952abb14c24c3eee0d53823
-EBUILD postgresql-9.6.24.ebuild 14326 BLAKE2B 946d0c681c44ec7b13a2d7dc63cf7e8f29bf41e4419863d2f85a86c7f6e747177550abfede7618c49a7d25b40a298f8901429e303c7eea9f774aec964ec012ea SHA512 a52d6bda4f8670d9024afb6c78daf9413f28b90cd4d9fbf81018ca7807f211b372da29465a72051cdc15a1e44e0946d2ee93c2fa347a04a26667a5015eb31de1
-EBUILD postgresql-9999.ebuild 14100 BLAKE2B b6ad36c1fa6e89db3876719b0950f77ffbd63cb36a3289285cac7661dfc6126ee49f83699aebc0b087262abf3d1f37eb84ab79c5e72a4dee18c4c4e09218a7e2 SHA512 4cb7274fc8cec788146ca4b164dd3c32647fd069c6ce85100c3279ec34ddf37229a6254b92804cb57d7c766d7b15a4c35b5a390260a57808a2f395184d858228
+EBUILD postgresql-10.19-r1.ebuild 13408 BLAKE2B 242cefd43604dfa557e83172783731f608a350467b1e546a935d1507acb54a2a714bc67175ce5846f82577516b07f4f74de59ae59481363c6c8cf40cb090e5e3 SHA512 2f02d8194f9a1eb51a69e6b8bf1f5b6bf461ce7b77dd983d13d2ccda3c10c1daab2a24c6472c7bd367548eeef53b5ce2dbcb77cfc3a00104787d426c140dbc09
+EBUILD postgresql-10.20-r1.ebuild 13416 BLAKE2B d70e618b0bc07941ff8dd794a64c3cf94798f470c24b0222f505e5c36188ccf51477e1c9a35e71dd753250a7f5fe744297a017289006bcffe2b38ddd3c744179 SHA512 aa03b4ac07f61e75b71ea664546f0a6011d6afe93e6e487c36a634156441422465f6e2680587f8ff3bde2fba04f071c60ab35502099a8657e942a5b24f76754c
+EBUILD postgresql-11.14-r1.ebuild 13449 BLAKE2B f077ebe227322eb51ed8a1a24c2fd4e22662eb277acbec3d536b87f8d1baa09fd728d5a790106b1a1acc25ec0e2605d5d3d6111d4bb69c956d6c972caaafc71e SHA512 2f31ca8f2a23c9a98dc43d6af8314105f761293d78cb9efdb59579e02abc20403cac0e06bca1d25c3fb6e09811dbe1b3774ccd4a8bb2a6ebe505bc45e105d972
+EBUILD postgresql-11.15-r1.ebuild 13457 BLAKE2B dee96904f9cdcbd4ba3bdfde139235901e42d8152c9d3450706a8bfbb65d612da6df97e68a441c65e0a156f2ded4f59ed19d084941683fcb64b46a05310fc9d8 SHA512 35a5a7ce237ffddd3d3267f78c4f89307a8c959d2d4f541d9dc5776554c16fab540d32fee34b67215300f02cc0d3a02e06ad8f818a841e0ec0778c2d84bbef28
+EBUILD postgresql-12.10-r1.ebuild 13475 BLAKE2B 26e617cf110875369197783e7a74c59658af39c946ef571c7094f24445fc4ab932e4fdb7415d15c021fe278ea72b982f4e27343807e5335e9aa56022dd4c26a4 SHA512 b29a8e68e286fada99424285e5094ade01b91affbafe80fa4f4f5f437d9ca739535e1ba05acb4efd2ae0027f991e5eb98e6ae52dd25681699dec000c69220ec2
+EBUILD postgresql-12.9-r1.ebuild 13467 BLAKE2B e49ff0c7521e57f25675f92d7a23605686bce7e1dd15220bde2b4a79e3f21e4dc1c372578b92f768f5b7458a0d7436e35f83a2fd70900fa418e99e64b945879e SHA512 0e60c3f3b3d2b9fbfeba5d77361c57cc5014f204939d2549b23c539cb9b3cf8af4865e51796432ea913f521939528955a3fb1dc2044bc91a30c98e617eaf50ff
+EBUILD postgresql-13.5-r1.ebuild 13905 BLAKE2B 6ec1336e5279a881cbd8426158ab60ddca6b75db0cf4f86c09d25bc69650c4dbb8ddf10ccb45d6469b0b8c779c5c76d7479509dc64685cf69f71a54cbde26166 SHA512 7cfe12c09ba8d19160e3ea010b0167803b754d74a04e5d50484c5df30d581c46bda04db4a2fc8c2230ea918d8954a3f29a3413b6a9d75da18b100ce7b4758249
+EBUILD postgresql-13.6-r2.ebuild 13913 BLAKE2B ec5aeab2c539b6387e8ef60568d2b0159401453b08956c6bf935de50e6a45f7a7e46f2778a82ec4c79ff76863596536d6cbdbf3530521e5a1207f122bd44dd8c SHA512 bf1c154aadae65943ad6e76111674498fc449ca80a9c7b940fbb83dd0e753e49976b2d9e66e7bb2f879030b403d1932b27261fff4839d77d6e4f20e478640b5c
+EBUILD postgresql-14.1-r1.ebuild 13901 BLAKE2B 20cbadf06f628a0003aab687e0ca53966763f11dd84dac386d54daabbfa398075cdfdae267a46144ff30c6cc022dfcb81403da8cf9d08638e35f622dec2565b0 SHA512 ac64ca0e454a5276e19d337495aff2f38b3e6308994db8cd004ac209ea70179eab81553fda8f1e3c9c5dff5e1b7f4d444a460d58a2490ee345fa06c96ed614a6
+EBUILD postgresql-14.2-r1.ebuild 13854 BLAKE2B aff48fafb0a5728a70dffbee12f80dc5f2dcf2ceda30af05b1cb409a434e491c66dfe970b26899c377ff362994903c58020c31444ef31ff7478c9a688991bb09 SHA512 63953e91dae73e3675dd65e2c0665ef3822f73a365e759de18e5241418b659e3802d201c5620f51e139171b8cc981454d95dfcfbf108f956e197335a33584d00
+EBUILD postgresql-9.6.24-r1.ebuild 14328 BLAKE2B 9e2d97a2caee5f87d4fafebbc6903d6e48195e7a06f7e6ecbef7612e7113a29b431d04d087bf3543af7a468255926fd1d3f10df08bf8789cff07f9931185189e SHA512 9d361a663d1905314eaac7321b91dbb89b47c02610795ffeaea2ab056063d660e30531f90d14714357487e1561c9aced8d71082325e2398e7c87fd6e7c683d31
+EBUILD postgresql-9999.ebuild 14102 BLAKE2B 821a52a05174b6b4d9c539d01563a45a0edded846b1533b5cc87ccfd45fcfd56bf2e77c49ec8ee1f5cf79d7174f0aaade405591e70aa5d7d81c068fc33fee923 SHA512 e1d8c3ce0347b9db2ba4aeec48cf08d99e522eb5663ae0b84b510baf07be4a06c83a9b6c951952a949a7c3984e373048db0f518ce234117d54ce773fc735ccb2
 MISC metadata.xml 716 BLAKE2B c881b294d82137c80ddfde58ef50074a2e2b92e6883e6ebc5d8c71a366e8cbb0568756b2044fc411dd18e89da0e5625df80b876820e0abeaccc24d26880d5145 SHA512 dd045716ced95dbac8763aea347125d27bdb230eeb64bfc932f94110eda2ad42aa892e9cb19595c0d2f4a593d2629d9709a7aea792ac16661a2c210158368ba3
diff --git a/dev-db/postgresql/files/postgres-llvm14.patch b/dev-db/postgresql/files/postgres-llvm14.patch
new file mode 100644
index 000000000000..2c7b91d75153
--- /dev/null
+++ b/dev-db/postgresql/files/postgres-llvm14.patch
@@ -0,0 +1,154 @@
+From d9f7ad54e552262ee0090e88d5abd3e04fcdeac8 Mon Sep 17 00:00:00 2001
+From: Thomas Munro <tmunro@postgresql.org>
+Date: Wed, 16 Mar 2022 11:35:00 +1300
+Subject: [PATCH] Back-patch LLVM 14 API changes.
+
+Since LLVM 14 has stopped changing and is about to be released,
+back-patch the following changes from the master branch:
+
+  e6a7600202105919bffd62b3dfd941f4a94e082b
+  807fee1a39de6bb8184082012e643951abb9ad1d
+  a56e7b66010f330782243de9e25ac2a6596be0e1
+
+Back-patch to 11, where LLVM JIT support came in.
+---
+ src/backend/jit/llvm/Makefile           |  6 +++++
+ src/backend/jit/llvm/llvmjit_error.cpp  | 35 +++++++++++++++++++++----
+ src/backend/jit/llvm/llvmjit_inline.cpp | 12 ++++++++-
+ 3 files changed, 47 insertions(+), 6 deletions(-)
+
+diff --git a/src/backend/jit/llvm/Makefile b/src/backend/jit/llvm/Makefile
+index 0268bd46d5..2da122a391 100644
+--- a/src/backend/jit/llvm/Makefile
++++ b/src/backend/jit/llvm/Makefile
+@@ -22,6 +22,12 @@ endif
+ PGFILEDESC = "llvmjit - JIT using LLVM"
+ NAME = llvmjit
+ 
++# LLVM 14 produces deprecation warnings.  We'll need to make some changes
++# before the relevant functions are removed, but for now silence the warnings.
++ifeq ($(GCC), yes)
++LLVM_CFLAGS += -Wno-deprecated-declarations
++endif
++
+ # All files in this directory use LLVM.
+ CFLAGS += $(LLVM_CFLAGS)
+ CXXFLAGS += $(LLVM_CXXFLAGS)
+diff --git a/src/backend/jit/llvm/llvmjit_error.cpp b/src/backend/jit/llvm/llvmjit_error.cpp
+index f4720732a3..5ad92f3090 100644
+--- a/src/backend/jit/llvm/llvmjit_error.cpp
++++ b/src/backend/jit/llvm/llvmjit_error.cpp
+@@ -23,15 +23,22 @@ extern "C"
+ 
+ #include "jit/llvmjit.h"
+ 
++#include <new>
+ 
+ static int fatal_new_handler_depth = 0;
+ static std::new_handler old_new_handler = NULL;
+ 
+ static void fatal_system_new_handler(void);
+ #if LLVM_VERSION_MAJOR > 4
++static void fatal_llvm_new_handler(void *user_data, const char *reason, bool gen_crash_diag);
++#if LLVM_VERSION_MAJOR < 14
+ static void fatal_llvm_new_handler(void *user_data, const std::string& reason, bool gen_crash_diag);
+ #endif
++#endif
++static void fatal_llvm_error_handler(void *user_data, const char *reason, bool gen_crash_diag);
++#if LLVM_VERSION_MAJOR < 14
+ static void fatal_llvm_error_handler(void *user_data, const std::string& reason, bool gen_crash_diag);
++#endif
+ 
+ 
+ /*
+@@ -129,23 +136,41 @@ fatal_system_new_handler(void)
+ #if LLVM_VERSION_MAJOR > 4
+ static void
+ fatal_llvm_new_handler(void *user_data,
+-					   const std::string& reason,
++					   const char *reason,
+ 					   bool gen_crash_diag)
+ {
+ 	ereport(FATAL,
+ 			(errcode(ERRCODE_OUT_OF_MEMORY),
+ 			 errmsg("out of memory"),
+-			 errdetail("While in LLVM: %s", reason.c_str())));
++			 errdetail("While in LLVM: %s", reason)));
++}
++#if LLVM_VERSION_MAJOR < 14
++static void
++fatal_llvm_new_handler(void *user_data,
++					   const std::string& reason,
++					   bool gen_crash_diag)
++{
++	fatal_llvm_new_handler(user_data, reason.c_str(), gen_crash_diag);
+ }
+ #endif
++#endif
+ 
+ static void
+ fatal_llvm_error_handler(void *user_data,
+-						 const std::string& reason,
++						 const char *reason,
+ 						 bool gen_crash_diag)
+ {
+ 	ereport(FATAL,
+ 			(errcode(ERRCODE_OUT_OF_MEMORY),
+-			 errmsg("fatal llvm error: %s",
+-					reason.c_str())));
++			 errmsg("fatal llvm error: %s", reason)));
+ }
++
++#if LLVM_VERSION_MAJOR < 14
++static void
++fatal_llvm_error_handler(void *user_data,
++						 const std::string& reason,
++						 bool gen_crash_diag)
++{
++	fatal_llvm_error_handler(user_data, reason.c_str(), gen_crash_diag);
++}
++#endif
+diff --git a/src/backend/jit/llvm/llvmjit_inline.cpp b/src/backend/jit/llvm/llvmjit_inline.cpp
+index 6f03595db5..9bb4b672a7 100644
+--- a/src/backend/jit/llvm/llvmjit_inline.cpp
++++ b/src/backend/jit/llvm/llvmjit_inline.cpp
+@@ -594,7 +594,11 @@ function_inlinable(llvm::Function &F,
+ 	if (F.materialize())
+ 		elog(FATAL, "failed to materialize metadata");
+ 
+-	if (F.getAttributes().hasFnAttribute(llvm::Attribute::NoInline))
++#if LLVM_VERSION_MAJOR < 14
++#define hasFnAttr hasFnAttribute
++#endif
++
++	if (F.getAttributes().hasFnAttr(llvm::Attribute::NoInline))
+ 	{
+ 		ilog(DEBUG1, "ineligibile to import %s due to noinline",
+ 			 F.getName().data());
+@@ -871,7 +875,9 @@ create_redirection_function(std::unique_ptr<llvm::Module> &importMod,
+ 	llvm::Function *AF;
+ 	llvm::BasicBlock *BB;
+ 	llvm::CallInst *fwdcall;
++#if LLVM_VERSION_MAJOR < 14
+ 	llvm::Attribute inlineAttribute;
++#endif
+ 
+ 	AF = llvm::Function::Create(F->getFunctionType(),
+ 								LinkageTypes::AvailableExternallyLinkage,
+@@ -880,9 +886,13 @@ create_redirection_function(std::unique_ptr<llvm::Module> &importMod,
+ 
+ 	Builder.SetInsertPoint(BB);
+ 	fwdcall = Builder.CreateCall(F, &*AF->arg_begin());
++#if LLVM_VERSION_MAJOR < 14
+ 	inlineAttribute = llvm::Attribute::get(Context,
+ 										   llvm::Attribute::AlwaysInline);
+ 	fwdcall->addAttribute(~0U, inlineAttribute);
++#else
++	fwdcall->addFnAttr(llvm::Attribute::AlwaysInline);
++#endif
+ 	Builder.CreateRet(fwdcall);
+ 
+ 	return AF;
+-- 
+2.30.2
+
diff --git a/dev-db/postgresql/postgresql-10.19.ebuild b/dev-db/postgresql/postgresql-10.19-r1.ebuild
index df3f68c9aec9..2451592a1f77 100644
--- a/dev-db/postgresql/postgresql-10.19.ebuild
+++ b/dev-db/postgresql/postgresql-10.19-r1.ebuild
@@ -35,7 +35,7 @@ virtual/libcrypt:=
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
diff --git a/dev-db/postgresql/postgresql-10.20.ebuild b/dev-db/postgresql/postgresql-10.20-r1.ebuild
index ebb0a2ed17f5..93f17aa04271 100644
--- a/dev-db/postgresql/postgresql-10.20.ebuild
+++ b/dev-db/postgresql/postgresql-10.20-r1.ebuild
@@ -35,7 +35,7 @@ virtual/libcrypt:=
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
diff --git a/dev-db/postgresql/postgresql-11.14.ebuild b/dev-db/postgresql/postgresql-11.14-r1.ebuild
index 0614243cb8c4..8ec21798e0ae 100644
--- a/dev-db/postgresql/postgresql-11.14.ebuild
+++ b/dev-db/postgresql/postgresql-11.14-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=13
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-14:=
+	<sys-devel/clang-14:=
 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
@@ -83,6 +84,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	use llvm && llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
diff --git a/dev-db/postgresql/postgresql-11.15.ebuild b/dev-db/postgresql/postgresql-11.15-r1.ebuild
index bc66c22563cc..4be0a8926b5d 100644
--- a/dev-db/postgresql/postgresql-11.15.ebuild
+++ b/dev-db/postgresql/postgresql-11.15-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=13
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-14:=
+	<sys-devel/clang-14:=
 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
@@ -83,6 +84,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	use llvm && llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
diff --git a/dev-db/postgresql/postgresql-12.10.ebuild b/dev-db/postgresql/postgresql-12.10-r1.ebuild
index 852f5715923c..3c97b24fd2a4 100644
--- a/dev-db/postgresql/postgresql-12.10.ebuild
+++ b/dev-db/postgresql/postgresql-12.10-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=14
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-15:=
+	<sys-devel/clang-15:=
 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
@@ -83,6 +84,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
@@ -99,6 +102,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
 	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
 
 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
diff --git a/dev-db/postgresql/postgresql-12.9.ebuild b/dev-db/postgresql/postgresql-12.9-r1.ebuild
index f3837a3f0404..b7d45b34ed5f 100644
--- a/dev-db/postgresql/postgresql-12.9.ebuild
+++ b/dev-db/postgresql/postgresql-12.9-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=14
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-15:=
+	<sys-devel/clang-15:=
 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
@@ -83,6 +84,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
@@ -99,6 +102,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
 	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
 
 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
diff --git a/dev-db/postgresql/postgresql-13.5.ebuild b/dev-db/postgresql/postgresql-13.5-r1.ebuild
index 5f6ce9b239e3..d204a6930de0 100644
--- a/dev-db/postgresql/postgresql-13.5.ebuild
+++ b/dev-db/postgresql/postgresql-13.5-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=14
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-15:=
+	<sys-devel/clang-15:=
 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
@@ -83,6 +84,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
@@ -101,6 +104,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
 	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
+	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
 
 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
diff --git a/dev-db/postgresql/postgresql-13.6.ebuild b/dev-db/postgresql/postgresql-13.6-r2.ebuild
index 213350b0e72e..7c89241ebf32 100644
--- a/dev-db/postgresql/postgresql-13.6.ebuild
+++ b/dev-db/postgresql/postgresql-13.6-r2.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=14
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-15:=
+	<sys-devel/clang-15:=
 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
@@ -83,6 +84,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
@@ -101,6 +104,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
 	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
+	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
 
 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
diff --git a/dev-db/postgresql/postgresql-14.2.ebuild b/dev-db/postgresql/postgresql-14.1-r1.ebuild
index 5dff65601bf4..db0770f6cb90 100644
--- a/dev-db/postgresql/postgresql-14.2.ebuild
+++ b/dev-db/postgresql/postgresql-14.1-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
+LLVM_MAX_SLOT=14
 
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
+inherit flag-o-matic linux-info llvm multilib pam prefix python-single-r1 systemd tmpfiles
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
@@ -34,10 +35,10 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
+	<sys-devel/llvm-15:=
+	<sys-devel/clang-15:=
 )
 lz4? ( app-arch/lz4 )
 pam? ( sys-libs/pam )
@@ -84,6 +85,8 @@ selinux? ( sec-policy/selinux-postgresql )
 "
 
 pkg_setup() {
+	llvm_pkg_setup
+
 	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
 
 	use python && python-single-r1_pkg_setup
@@ -100,6 +103,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
 	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
+	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
 
 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
diff --git a/dev-db/postgresql/postgresql-14.1.ebuild b/dev-db/postgresql/postgresql-14.2-r1.ebuild
index 5dff65601bf4..5d0ca44d23aa 100644
--- a/dev-db/postgresql/postgresql-14.1.ebuild
+++ b/dev-db/postgresql/postgresql-14.2-r1.ebuild
@@ -34,7 +34,7 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
 	sys-devel/llvm:=
 	sys-devel/clang:=
@@ -100,6 +100,7 @@ src_prepare() {
 	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
 
 	use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
+	use server && eapply "${FILESDIR}/postgres-llvm14.patch"
 
 	if use pam ; then
 		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
diff --git a/dev-db/postgresql/postgresql-9.6.24.ebuild b/dev-db/postgresql/postgresql-9.6.24-r1.ebuild
index 8310ab4b524f..bd5c27b6bf08 100644
--- a/dev-db/postgresql/postgresql-9.6.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.24-r1.ebuild
@@ -34,7 +34,7 @@ sys-apps/less
 virtual/libcrypt:=
 virtual/libintl
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index f290a4330a72..cce0a2f8499a 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -32,7 +32,7 @@ sys-apps/less
 virtual/libintl
 icu? ( dev-libs/icu:= )
 kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
+ldap? ( net-nds/openldap:= )
 llvm? (
 	sys-devel/llvm:=
 	sys-devel/clang:=