gentoo resync : 04.01.2022

6 files changed, 16 insertions, 28 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 363f40264d16..c96a3d6e6cd5 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index d4939ad02263..5b1b9311f63b 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -25,8 +25,8 @@ DIST openldap-2.4.58.tgz 5885225 BLAKE2B effb618dba03497796a497cd7f53ec52e389133
 DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8 SHA512 233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968
 DIST openldap-2.5.4.tgz 6415235 BLAKE2B 16e466d01dc7642786bb88a101854513f1239f1e817fd05145e89deb54bc1b911a5dc5f42b132747f14bdd2a3355e7c398b8b14937e7093361f4a96bfb7e9197 SHA512 00b57c9179acf3b1bde738e91604f3b09b5f5309106362bb947154d131868f233713eaa75c9af9771bfad731902d67406e8fb429851bad227fc48054cace16a8
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.57-r2.ebuild 29103 BLAKE2B 176097aa953f53efffa29785125bdeddd2922836a7b1ce9fd36d537c6065833463f6800e0e52a6293c27d74b98c91189b6a3a4c0d195b39d33268383f82e639f SHA512 6828adbfaa6d4d9ec6f16322a965195422c2c0d018d2673dd3bc23b26314ce0a43ab7787f51f22d503298a533c7260a0a782e5091e1dbe716c13cee81be01574
-EBUILD openldap-2.4.58-r2.ebuild 29104 BLAKE2B 75fc32233986c967a82b7961e94316e4b3b1eb0b32c67e6762f52f74fbf7e3ee50eea113510fda141a312c0f7da22085487c3ca3c8bfba67d8511f87dee0904a SHA512 bc1d6876367ab3d1dc29ecb85e9c62a076bfde77d7771de04d3dba52a5b3d6fafc192fc4cde6ba6a084871826b77ea07f693150522bac045eaca0c17b02485c0
-EBUILD openldap-2.4.59-r2.ebuild 29111 BLAKE2B 4f842320fa48255cc5284a0b3707b2b0381a1334fd9720657c867869954f3af7efe6a085fe608ca29f50d81c1aacc4378f70a2ce2d3c3329921d948c2e747881 SHA512 ebaa4d6f3858d4ae055af9b30f927f3d265f6c58397edd4ee9decfe5fdb130a9410a05047ad37eb48edfcf90029f9705bfc3cda550da2fc7912015394d9593d6
-EBUILD openldap-2.5.4-r1.ebuild 27222 BLAKE2B b1ef40472c11ba9be316e56c3422530cf996d258df72d540b6bb13b9831e6261a2820a52d75defc2751ec401eca48af0004e6c4978800219e51e8d5cd4a3e361 SHA512 ab682204181ba86498cfa5b40cb33cabaeb086a779aea34fea04903b6758a2dbeab07fa9149a71d75d28317fb3f6473b4ea3396a2493e3fa3ed66ab80aa0de85
+EBUILD openldap-2.4.57-r2.ebuild 28998 BLAKE2B 01eeef82366ba627d5bdc585fd3fca22443a1eb34690747a3d23f6fc52d07278cefaeda84bb3741ff0c9d6e02f9266bdfde29f20023f73db9d2edb4e1e70b738 SHA512 5c56e84a0c0caa03f672be285ea9f8561a2ba910b7419e54c422df3c1a9dd99c5766d51a964d7336b8d9bb824e756eb13229376cd5d163dc49c1d01368803e84
+EBUILD openldap-2.4.58-r2.ebuild 28999 BLAKE2B 4e2705b175ad9d804ab8b6bdcc788dc94b9f30cffe97e78519a2d8da62132623a2d593f01d85c1923e7c472bc878c1838afca88787773dc8ab6ca519b22ed8e6 SHA512 25f9bff67af65e60d7e4d9d8948172b76756b03b7c22324e1e992205636346006e9b2f8698d615a4eefb1493e84ec8a707e420d13a9654e1a435f3af354c8028
+EBUILD openldap-2.4.59-r2.ebuild 29006 BLAKE2B 50dbead8923aa438b3fc3ef4df689daf19632f758aeede75a101706d26d4cbe71d0fe9f628fdec091e6d5b4388e7d3bf2ab1cd52dc1c36547111679a915be795 SHA512 2ce1bef71ad542768f1a715fba3ec366a9005b6cae103744b3d125ad158c3b63f2ff49ae65a2faa7cc3dbe7493075d3ed42d04434fb60b14aa414a6298188c29
+EBUILD openldap-2.5.4-r1.ebuild 27110 BLAKE2B f2cd62e2af7fe301500b6249ad547a378605688419f90ecd20919f5289da2bfc24eea50e93a27303f70bda14a7f671a2e20445012d0060fdc8df3824424acf6b SHA512 e5d6267f8b7d74f32a3964d424497c40e01ce637fb945c2dbdf07fb3cecad60cca7b66452edda644b925887c0a02e392bf33cafe6066c47d67fa029c3e7933e9
 MISC metadata.xml 1031 BLAKE2B 1e98f23b8035c52190d99b0b009ce4fa65d1e64902a3af2472f5866028f02ae3e599eb05ed2a45393118368786d64b8d30b77044c2a4019da4e7866c626a99aa SHA512 0feee9e685a5f4a2dd61ca9f0845de8c65e83ba08a67a3a90e8c97e0bf4ccf72b969b0328fa84ba9ec34fafd8bd97a448e9a3f3d2a2b3238e6dd7a2b38932293
diff --git a/net-nds/openldap/openldap-2.4.57-r2.ebuild b/net-nds/openldap/openldap-2.4.57-r2.ebuild
index 0687cd44fefb..f594d17cece9 100644
--- a/net-nds/openldap/openldap-2.4.57-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.57-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+inherit autotools db-use flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
 
 BIS_PN=rfc2307bis.schema
 BIS_PV=20140524
@@ -42,7 +42,7 @@ REQUIRED_USE="cxx? ( sasl )
 # Do not add any AGPL-3 BDB here!
 # See bug 525110, comment 15.
 # Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}"
 BDB_PKGS=''
 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
 
@@ -401,9 +401,6 @@ build_contrib_module() {
 }
 
 src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
 	# connectionless ldap per bug #342439
 	append-cppflags -DLDAP_CONNECTIONLESS
 
diff --git a/net-nds/openldap/openldap-2.4.58-r2.ebuild b/net-nds/openldap/openldap-2.4.58-r2.ebuild
index 3a6aa07bb4a3..afe2534c109e 100644
--- a/net-nds/openldap/openldap-2.4.58-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.58-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+inherit autotools db-use flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
 
 BIS_PN=rfc2307bis.schema
 BIS_PV=20140524
@@ -42,7 +42,7 @@ REQUIRED_USE="cxx? ( sasl )
 # Do not add any AGPL-3 BDB here!
 # See bug 525110, comment 15.
 # Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}"
 BDB_PKGS=''
 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
 
@@ -401,9 +401,6 @@ build_contrib_module() {
 }
 
 src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
 	# connectionless ldap per bug #342439
 	append-cppflags -DLDAP_CONNECTIONLESS
 
diff --git a/net-nds/openldap/openldap-2.4.59-r2.ebuild b/net-nds/openldap/openldap-2.4.59-r2.ebuild
index 440319751d1e..25141776f10a 100644
--- a/net-nds/openldap/openldap-2.4.59-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.59-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+inherit autotools db-use flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
 
 BIS_PN=rfc2307bis.schema
 BIS_PV=20140524
@@ -42,7 +42,7 @@ REQUIRED_USE="cxx? ( sasl )
 # Do not add any AGPL-3 BDB here!
 # See bug 525110, comment 15.
 # Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}"
 BDB_PKGS=''
 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
 
@@ -401,9 +401,6 @@ build_contrib_module() {
 }
 
 src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
 	# connectionless ldap per bug #342439
 	append-cppflags -DLDAP_CONNECTIONLESS
 
diff --git a/net-nds/openldap/openldap-2.5.4-r1.ebuild b/net-nds/openldap/openldap-2.5.4-r1.ebuild
index 72168dd71c9c..53daba349ce5 100644
--- a/net-nds/openldap/openldap-2.5.4-r1.ebuild
+++ b/net-nds/openldap/openldap-2.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
 
 BIS_PN=rfc2307bis.schema
 BIS_PV=20140524
@@ -40,7 +40,7 @@ REQUIRED_USE="cxx? ( sasl )
 # Do not add any AGPL-3 BDB here!
 # See bug 525110, comment 15.
 # Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}"
 BDB_PKGS=''
 for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
 
@@ -345,9 +345,6 @@ build_contrib_module() {
 }
 
 src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
 	# connectionless ldap per bug #342439
 	append-cppflags -DLDAP_CONNECTIONLESS