[gnome-build-meta/jjardon/ostree_fdsdk: 6/6] Use flatpak from freedesktop-sdk

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 60aae5c99a5b87785d47e1bcb847e2919ccaaf87
Author: Javier Jardón <jjardon gnome org>
Date:   Sat May 2 15:04:34 2020 +0100

    Use flatpak from freedesktop-sdk

 elements/boards/pinebook-pro/deps.bst    |  2 +-
 elements/core-deps.bst                   |  1 -
 elements/core-deps/eos-updater.bst       |  2 +-
 elements/core-deps/flatpak.bst           | 32 --------------------------------
 elements/core/gnome-builder.bst          |  2 +-
 elements/core/gnome-software.bst         |  2 +-
 elements/flatpak-platform-extensions.bst |  2 +-
 elements/flatpak-runtimes.bst            |  2 +-
 elements/vm/flathub-config.bst           |  2 +-
 9 files changed, 7 insertions(+), 40 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/deps.bst b/elements/boards/pinebook-pro/deps.bst
index 4d8651ae..fd307f10 100644
--- a/elements/boards/pinebook-pro/deps.bst
+++ b/elements/boards/pinebook-pro/deps.bst
@@ -2,6 +2,7 @@ kind: stack
 
 runtime-depends:
 - freedesktop-sdk.bst:components/avahi.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 - freedesktop-sdk.bst:components/util-linux.bst
 - freedesktop-sdk.bst:components/tzdata.bst
 - freedesktop-sdk.bst:components/systemd.bst
@@ -9,7 +10,6 @@ runtime-depends:
 - freedesktop-sdk.bst:components/shadow.bst
 - freedesktop-sdk.bst:vm/mesa-default.bst
 
-- core-deps/flatpak.bst
 - vm/ostree-config.bst
 - core-deps/eos-updater.bst
 
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 7a652c27..0d6d645f 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -24,7 +24,6 @@ depends:
 - core-deps/evolution-data-server.bst
 - core-deps/exempi.bst
 - core-deps/exiv2.bst
-- core-deps/flatpak.bst
 - core-deps/folks.bst
 - core-deps/gegl.bst
 - core-deps/geocode-glib.bst
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 802dcbc8..2f01b766 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -6,10 +6,10 @@ sources:
 
 depends:
 - core-deps/NetworkManager.bst
-- core-deps/flatpak.bst
 - core-deps/mogwai.bst
 - sdk/gobject-introspection.bst
 - freedesktop-sdk.bst:components/avahi.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 - freedesktop-sdk.bst:components/gnupg.bst
 - freedesktop-sdk.bst:components/ostree.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index e6b8dae8..4c3d0820 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -11,7 +11,6 @@ runtime-depends:
 - sdk/pygobject.bst
 - sdk/vala.bst
 depends:
-- core-deps/flatpak.bst
 - core-deps/glade-libs.bst
 - core-deps/gspell.bst
 - core-deps/libdazzle.bst
@@ -28,5 +27,6 @@ depends:
 - sdk/gtksourceview.bst
 - sdk/gvfs.bst
 - sdk/librsvg.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 - freedesktop-sdk.bst:components/llvm.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index 3c7eafd3..fbea463a 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -9,7 +9,6 @@ build-depends:
 depends:
 - core-deps/eos-updater.bst
 - core-deps/polkit.bst
-- core-deps/flatpak.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/gspell.bst
 - core-deps/libgudev.bst
@@ -24,6 +23,7 @@ depends:
 - sdk/gtk+-3.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/flatpak-platform-extensions.bst b/elements/flatpak-platform-extensions.bst
index e33ffdbb..3d32e3d0 100644
--- a/elements/flatpak-platform-extensions.bst
+++ b/elements/flatpak-platform-extensions.bst
@@ -1,7 +1,7 @@
 kind: flatpak_repo
 
 build-depends:
-- freedesktop-sdk.bst:deploy-tools/flatpak.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 - freedesktop-sdk.bst:flatpak-images/mesa.bst
 - freedesktop-sdk.bst:flatpak-images/platform-vaapi.bst
 
diff --git a/elements/flatpak-runtimes.bst b/elements/flatpak-runtimes.bst
index cdc54605..7f78da96 100644
--- a/elements/flatpak-runtimes.bst
+++ b/elements/flatpak-runtimes.bst
@@ -1,6 +1,6 @@
 kind: flatpak_repo
 build-depends:
-- freedesktop-sdk.bst:deploy-tools/flatpak.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 (?):
 # platform and sdk should not be built on i686
 - arch != 'i686':
diff --git a/elements/vm/flathub-config.bst b/elements/vm/flathub-config.bst
index 25d2036b..acc155de 100644
--- a/elements/vm/flathub-config.bst
+++ b/elements/vm/flathub-config.bst
@@ -4,7 +4,7 @@ depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 runtime-depends:
-- core-deps/flatpak.bst
+- freedesktop-sdk.bst:components/flatpak.bst
 
 config:
   install-commands: