[gnome-build-meta/abderrahim/berkeleydb: 2/2] remove core-deps/berkeleydb.bst

[Marge Bot <marge-bot src gnome org>]

commit e6764356e5549b8244963fd6855900f6739a809a
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Dec 22 14:37:05 2021 +0100

    remove core-deps/berkeleydb.bst
    
    * evolution-data-server is now build without it
    * openldap no longer depends on it
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1421>

 elements/core-deps/berkeleydb.bst            | 10 ----------
 elements/core-deps/evolution-data-server.bst |  5 +++--
 elements/core-deps/openldap.bst              | 14 ++++++++------
 3 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index fa6292c39..bf91d8c87 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -27,9 +27,10 @@ depends:
 
 variables:
   cmake-local: >-
+    -DLIB_INSTALL_DIR=%{libdir}
+    -DSYSCONF_INSTALL_DIR=%{sysconfdir}
     -DENABLE_INTROSPECTION=ON
     -DENABLE_VALA_BINDINGS=ON
     -DENABLE_UOA=OFF
     -DENABLE_GOOGLE_AUTH=OFF
-    -DLIB_INSTALL_DIR=%{libdir}
-    -DSYSCONF_INSTALL_DIR=%{sysconfdir}
+    -DWITH_LIBDB=OFF
diff --git a/elements/core-deps/openldap.bst b/elements/core-deps/openldap.bst
index 65374085e..08656aada 100644
--- a/elements/core-deps/openldap.bst
+++ b/elements/core-deps/openldap.bst
@@ -1,14 +1,16 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.tgz
+  url: https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.0.tgz
+
 build-depends:
 - freedesktop-sdk.bst:components/groff.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
-- core-deps/berkeleydb.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-config:
-  install-commands:
-    (>):
-    - mv %{install-root}/var/run %{install-root}
+
+variables:
+  conf-local: >-
+    --disable-slapd