From 52bfe0a878feada90bb599a0adbcb4f8ba207c43 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 6 May 2024 12:45:26 +0200
Subject: Switch from libodb* to version from libbutl

---
 bpkg/buildfile        | 11 ++++-------
 bpkg/version.hxx.in   |  8 --------
 manifest              |  3 ---
 repositories.manifest | 12 ------------
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/bpkg/buildfile b/bpkg/buildfile
index 0ba60dc..8836712 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -15,15 +15,12 @@ import libs = build2%lib{build2}
 for m: bash bin c cc cli cxx in version
   import libs += build2%lib{build2-$m}
 
+# @@ TMP we require libsqlite3 to be interface dependency of libbut-odb only
+#    for the database migrations to schema versions 13 and 14.
+#
 import libs += libbpkg%lib{bpkg}
 import libs += libbutl%lib{butl}
-import libs += libodb%lib{odb}
-import libs += libodb-sqlite%lib{odb-sqlite}
-
-# @@ TMP Only required for the database migrations to schema versions 13 and
-#    14.
-#
-import libs += libsqlite3%lib{sqlite3}
+import libs += libbutl%lib{butl-odb}
 
 options_topics =           \
 bpkg-options               \
diff --git a/bpkg/version.hxx.in b/bpkg/version.hxx.in
index 22da973..603a5f7 100644
--- a/bpkg/version.hxx.in
+++ b/bpkg/version.hxx.in
@@ -43,14 +43,6 @@ $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
 $libbpkg.check(LIBBPKG_VERSION, LIBBPKG_SNAPSHOT)$
 
-#include <odb/version.hxx>
-
-$libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$
-
-#include <odb/sqlite/version.hxx>
-
-$libodb_sqlite.check(LIBODB_SQLITE_VERSION, LIBODB_SQLITE_SNAPSHOT)$
-
 // User agent.
 //
 #if   defined(_WIN32)
diff --git a/manifest b/manifest
index e826689..07e97ff 100644
--- a/manifest
+++ b/manifest
@@ -18,9 +18,6 @@ depends: * build2 >= 0.16.0-
 depends: * bpkg >= 0.16.0-
 # @@ DEP Should probably become conditional dependency.
 #requires: ? cli ; Only required if changing .cli files.
-depends: libodb [2.5.0-b.26.1 2.5.0-b.27)
-depends: libodb-sqlite [2.5.0-b.26.1 2.5.0-b.27)
-depends: libsqlite3 ^3.21.0 ; ATTACH in transaction
 depends: libbutl [0.17.0-a.0.1 0.17.0-a.1)
 depends: libbpkg [0.17.0-a.0.1 0.17.0-a.1)
 depends: build2 [0.17.0-a.0.1 0.17.0-a.1)
diff --git a/repositories.manifest b/repositories.manifest
index 29cb1cf..5adbbe4 100644
--- a/repositories.manifest
+++ b/repositories.manifest
@@ -12,15 +12,3 @@ location: ../libbutl.git##HEAD
 :
 role: prerequisite
 location: ../libbpkg.git##HEAD
-
-:
-role: prerequisite
-location: https://git.build2.org/packaging/sqlite/sqlite.git##HEAD
-
-:
-role: prerequisite
-location: https://git.codesynthesis.com/odb/libodb.git##HEAD
-
-:
-role: prerequisite
-location: https://git.codesynthesis.com/odb/libodb-sqlite.git##HEAD
-- 
cgit v1.1