[gnome-build-meta/jjardon/mirrors2] Configure project to use GNOME mirrors instead upstream repos directly




commit 193bc0e3f6981e5fb70f80abf28f6730294d3422
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Dec 21 14:21:51 2021 +0000

    Configure project to use GNOME mirrors instead upstream repos directly
    
    This reverts "revert mirroring configuration (!1403)"
    This reverts commit bc878cf98c6999f0c708dcea44eea1f7bdecf264.

 elements/boards/common/arm-none-eabi-binutils.bst  |   2 +-
 elements/boards/common/arm-none-eabi-gcc.bst       |   8 +-
 elements/boards/common/dtc.bst                     |   2 +-
 .../boards/pinebook-pro/arm-trusted-firmware.bst   |   2 +-
 elements/boards/pinebook-pro/keyboard-updater.bst  |   2 +-
 elements/boards/pinebook-pro/linux.bst             |   2 +-
 elements/boards/pinebook-pro/u-boot.bst            |   2 +-
 elements/boards/pinebook-pro/vim.bst               |   2 +-
 elements/boards/raspberrypi-4/bsp/firmware.bst     |   4 +-
 elements/boards/raspberrypi-4/bsp/rpi-userland.bst |   2 +-
 elements/boards/raspberrypi-4/bsp/u-boot.bst       |   2 +-
 elements/boards/rock64/arm-trusted-firmware.bst    |   2 +-
 elements/boards/rock64/u-boot.bst                  |   2 +-
 elements/core-deps/LibRaw.bst                      |   2 +-
 elements/core-deps/LibVNCServer.bst                |   2 +-
 elements/core-deps/ModemManager.bst                |   2 +-
 elements/core-deps/NetworkManager.bst              |   2 +-
 elements/core-deps/accountsservice.bst             |   2 +-
 elements/core-deps/appstream.bst                   |   2 +-
 elements/core-deps/babl.bst                        |   2 +-
 elements/core-deps/berkeleydb.bst                  |   2 +-
 elements/core-deps/boost.bst                       |   2 +-
 elements/core-deps/cairomm-1.0.bst                 |   2 +-
 elements/core-deps/callaudiod.bst                  |   2 +-
 elements/core-deps/clutter-gst.bst                 |   2 +-
 elements/core-deps/clutter-gtk.bst                 |   2 +-
 elements/core-deps/clutter.bst                     |   2 +-
 elements/core-deps/cmark.bst                       |   2 +-
 elements/core-deps/colord-gtk.bst                  |   1 +
 elements/core-deps/colord.bst                      |   2 +-
 elements/core-deps/cups-pk-helper.bst              |   2 +-
 elements/core-deps/dnsmasq.bst                     |   2 +-
 elements/core-deps/dotconf.bst                     |   2 +-
 elements/core-deps/ebtables.bst                    |   2 +-
 elements/core-deps/eos-updater.bst                 |   2 +-
 elements/core-deps/espeak.bst                      |   2 +-
 elements/core-deps/exempi.bst                      |   2 +-
 elements/core-deps/exiv2.bst                       |   2 +-
 elements/core-deps/feedbackd.bst                   |   2 +-
 elements/core-deps/flatpak-builder.bst             |   2 +-
 elements/core-deps/flatpak.bst                     |   2 +-
 elements/core-deps/freerdp.bst                     |   2 +-
 elements/core-deps/fwupd-efi.bst                   |   2 +-
 elements/core-deps/fwupd.bst                       |   2 +-
 elements/core-deps/gegl.bst                        |   2 +-
 elements/core-deps/gexiv2.bst                      |   2 +-
 elements/core-deps/glib-testing.bst                |   2 +-
 elements/core-deps/graphviz.bst                    |   2 +-
 elements/core-deps/gst-editing-services.bst        |   2 +-
 elements/core-deps/intltool.bst                    |   2 +-
 elements/core-deps/libbluray.bst                   |   2 +-
 elements/core-deps/libcacard.bst                   |   2 +-
 elements/core-deps/libcanberra.bst                 |   2 +-
 elements/core-deps/libcap-ng.bst                   |   2 +-
 elements/core-deps/libcdio-paranoia.bst            |   2 +-
 elements/core-deps/libcdio.bst                     |   2 +-
 elements/core-deps/libcue.bst                      |   2 +-
 elements/core-deps/libdvdread.bst                  |   2 +-
 elements/core-deps/libgit2.bst                     |   2 +-
 elements/core-deps/libgphoto2.bst                  |   2 +-
 elements/core-deps/libgusb.bst                     |   2 +-
 elements/core-deps/libgweather.bst                 |   2 +-
 elements/core-deps/libimobiledevice.bst            |   2 +-
 elements/core-deps/libinput.bst                    |   2 +-
 elements/core-deps/libjcat.bst                     |   2 +-
 elements/core-deps/libmbim.bst                     |   2 +-
 elements/core-deps/libmtp.bst                      |   2 +-
 elements/core-deps/libmusicbrainz.bst              |   2 +-
 elements/core-deps/libnfs.bst                      |   2 +-
 elements/core-deps/liboauth.bst                    |   2 +-
 elements/core-deps/libosinfo.bst                   |   2 +-
 elements/core-deps/libostree.bst                   |   2 +-
 elements/core-deps/libpcap.bst                     |   2 +-
 elements/core-deps/libqmi.bst                      |   2 +-
 elements/core-deps/libssh2.bst                     |   2 +-
 elements/core-deps/libusbmuxd.bst                  |   2 +-
 elements/core-deps/libvirt-glib.bst                |   2 +-
 elements/core-deps/libvirt.bst                     |   2 +-
 elements/core-deps/libxcvt.bst                     |   2 +-
 elements/core-deps/libxklavier.bst                 |   2 +-
 elements/core-deps/lmdb.bst                        |   2 +-
 elements/core-deps/malcontent.bst                  |   2 +-
 elements/core-deps/mogwai.bst                      |   2 +-
 elements/core-deps/mpc.bst                         |   2 +-
 elements/core-deps/neon.bst                        |   2 +-
 elements/core-deps/osinfo-db-tools.bst             |   2 +-
 elements/core-deps/osinfo-db.bst                   |   2 +-
 elements/core-deps/perl-parse-yapp.bst             |   2 +-
 elements/core-deps/plist.bst                       |   2 +-
 elements/core-deps/plymouth.bst                    |   2 +-
 elements/core-deps/portaudio.bst                   |   2 +-
 elements/core-deps/power-profiles-daemon.bst       |   2 +-
 elements/core-deps/ppp.bst                         |   2 +-
 elements/core-deps/protobuf.bst                    |   2 +-
 elements/core-deps/pycups.bst                      |   2 +-
 elements/core-deps/python-pyparsing.bst            |   2 +-
 elements/core-deps/qemu.bst                        |   2 +-
 elements/core-deps/rpcsvc-proto.bst                |   2 +-
 elements/core-deps/samba.bst                       |   2 +-
 elements/core-deps/sane-backends.bst               |   2 +-
 elements/core-deps/sofia-sip.bst                   |   2 +-
 elements/core-deps/speech-dispatcher.bst           |   2 +-
 elements/core-deps/spice-gtk.bst                   |   2 +-
 elements/core-deps/spice-protocol.bst              |   2 +-
 elements/core-deps/spice.bst                       |   2 +-
 elements/core-deps/startup-notification.bst        |   2 +-
 elements/core-deps/system-config-printer.bst       |   2 +-
 elements/core-deps/udisks2.bst                     |   2 +-
 elements/core-deps/uhttpmock.bst                   |   2 +-
 elements/core-deps/upower.bst                      |   2 +-
 elements/core-deps/usbredir.bst                    |   2 +-
 elements/core-deps/virglrenderer.bst               |   2 +-
 elements/core-deps/xdg-desktop-portal-gtk.bst      |   2 +-
 elements/core-deps/xdg-sound-theme.bst             |   2 +-
 elements/core-deps/xmlb.bst                        |   2 +-
 elements/freedesktop-sdk.bst                       |   2 +-
 elements/iso/isomd5sum.bst                         |   2 +-
 elements/iso/libburn.bst                           |   2 +-
 elements/iso/libisoburn.bst                        |   2 +-
 elements/iso/libisofs.bst                          |   2 +-
 elements/sdk-deps/bubblewrap.bst                   |   2 +-
 elements/sdk-deps/ibus.bst                         |   2 +-
 elements/sdk-deps/libsass.bst                      |   2 +-
 elements/sdk-deps/python-smartypants.bst           |   2 +-
 elements/sdk-deps/python-typogrify.bst             |   2 +-
 elements/sdk-deps/sassc.bst                        |   2 +-
 elements/sdk-deps/xdg-dbus-proxy.bst               |   2 +-
 elements/sdk/adobe-source-code-pro-fonts.bst       |   2 +-
 elements/sdk/cantarell-fonts.bst                   |   2 +-
 elements/sdk/enchant-2.bst                         |   2 +-
 elements/sdk/fcitx.bst                             |   2 +-
 elements/sdk/geoclue.bst                           |   2 +-
 elements/sdk/krb5.bst                              |   2 +-
 elements/sdk/libwpe.bst                            |   2 +-
 elements/sdk/pinentry.bst                          |   2 +-
 elements/sdk/vala-tarball.bst                      |   2 +-
 elements/sdk/webkitgtk.inc                         |   2 +-
 elements/sdk/woff2.bst                             |   2 +-
 elements/sdk/wpebackend-fdo.bst                    |   2 +-
 elements/vm/NetworkManager-fortisslvpn.bst         |   2 +-
 elements/vm/NetworkManager-openconnect.bst         |   2 +-
 elements/vm/NetworkManager-openvpn.bst             |   2 +-
 elements/vm/NetworkManager-vpnc.bst                |   2 +-
 elements/vm/android-udev-rules.bst                 |   2 +-
 elements/vm/anthy.bst                              |   2 +-
 elements/vm/buildstream/arpy.bst                   |   2 +-
 elements/vm/buildstream/breezy.bst                 |   2 +-
 elements/vm/buildstream/bst-external.bst           |   2 +-
 elements/vm/buildstream/buildstream.bst            |   2 +-
 elements/vm/buildstream/click.bst                  |   2 +-
 elements/vm/buildstream/grpcio.bst                 |   2 +-
 elements/vm/buildstream/pluginbase.bst             |   2 +-
 elements/vm/buildstream/psutil.bst                 |   2 +-
 elements/vm/buildstream/pytest-runner.bst          |   2 +-
 elements/vm/buildstream/python3-configobj.bst      |   2 +-
 elements/vm/buildstream/python3-dulwich.bst        |   2 +-
 elements/vm/buildstream/python3-fastimport.bst     |   2 +-
 elements/vm/buildstream/python3-markupsafe.bst     |   2 +-
 elements/vm/buildstream/ruamel-yaml-clib.bst       |   2 +-
 elements/vm/buildstream/ruamel-yaml.bst            |   2 +-
 elements/vm/buildstream/ujson.bst                  |   2 +-
 elements/vm/eos-repartition.bst                    |   2 +-
 elements/vm/fish.bst                               |   4 +-
 elements/vm/git-lfs.bst                            |   2 +-
 elements/vm/ibus-anthy.bst                         |   2 +-
 elements/vm/ibus-hangul.bst                        |   2 +-
 elements/vm/ibus-libpinyin.bst                     |   2 +-
 elements/vm/kyotocabinet.bst                       |   2 +-
 elements/vm/libhangul.bst                          |   2 +-
 elements/vm/libpinyin.bst                          |   4 +-
 elements/vm/lxc.bst                                |   2 +-
 elements/vm/nss-mdns.bst                           |   2 +-
 elements/vm/ntfs-3g.bst                            |   2 +-
 elements/vm/openconnect.bst                        |   2 +-
 elements/vm/openfortivpn.bst                       |   2 +-
 elements/vm/opensc.bst                             |   2 +-
 elements/vm/openvpn.bst                            |   2 +-
 elements/vm/qemu-tools.bst                         |   2 +-
 elements/vm/spice-vdagent.bst                      |   2 +-
 elements/vm/toolbox.bst                            |  34 +++---
 elements/vm/uresourced.bst                         |   2 +-
 elements/vm/vpnc-scripts.bst                       |   2 +-
 elements/world/cairomm.bst                         |   2 +-
 elements/world/dbus-glib.bst                       |   2 +-
 elements/world/libhandy-0.bst                      |   2 +-
 elements/world/qqwing.bst                          |   2 +-
 elements/world/wlroots.bst                         |   2 +-
 include/aliases.yml                                | 101 +++++++++++++++++
 include/mirrors.yml                                | 120 +++++++++++++++++++++
 project.conf                                       |  39 +------
 190 files changed, 432 insertions(+), 245 deletions(-)
---
diff --git a/elements/boards/common/arm-none-eabi-binutils.bst 
b/elements/boards/common/arm-none-eabi-binutils.bst
index 6ad052dcf..a21e4c977 100644
--- a/elements/boards/common/arm-none-eabi-binutils.bst
+++ b/elements/boards/common/arm-none-eabi-binutils.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz
+  url: tar_ftp_gnu_org:gnu/binutils/binutils-2.32.tar.xz
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/boards/common/arm-none-eabi-gcc.bst b/elements/boards/common/arm-none-eabi-gcc.bst
index 8b810416d..351a50fdb 100644
--- a/elements/boards/common/arm-none-eabi-gcc.bst
+++ b/elements/boards/common/arm-none-eabi-gcc.bst
@@ -2,15 +2,15 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz
+  url: tar_ftp_gnu_org:gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz
 - kind: tar
-  url: https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
+  url: tar_ftp_gnu_org:gnu/gmp/gmp-6.1.2.tar.xz
   directory: gmp
 - kind: tar
-  url: https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz
+  url: tar_ftp_gnu_org:gnu/mpfr/mpfr-4.0.2.tar.xz
   directory: mpfr
 - kind: tar
-  url: https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+  url: tar_ftp_gnu_org:gnu/mpc/mpc-1.1.0.tar.gz
   directory: mpc
 
 build-depends:
diff --git a/elements/boards/common/dtc.bst b/elements/boards/common/dtc.bst
index e2dede3f2..31ba2b464 100644
--- a/elements/boards/common/dtc.bst
+++ b/elements/boards/common/dtc.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.6.1.tar.gz
+  url: tar_git_kernel_org:pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.6.1.tar.gz
 
 depends:
 - freedesktop-sdk.bst:components/bison.bst
diff --git a/elements/boards/pinebook-pro/arm-trusted-firmware.bst 
b/elements/boards/pinebook-pro/arm-trusted-firmware.bst
index 60a1d4445..504516f82 100644
--- a/elements/boards/pinebook-pro/arm-trusted-firmware.bst
+++ b/elements/boards/pinebook-pro/arm-trusted-firmware.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: https://github.com/ARM-software/arm-trusted-firmware.git
+  url: github_com:ARM-software/arm-trusted-firmware.git
   track: 22d12c4148c373932a7a81e5d1c59a767e143ac2
   track-tags: false
 
diff --git a/elements/boards/pinebook-pro/keyboard-updater.bst 
b/elements/boards/pinebook-pro/keyboard-updater.bst
index dde5dbd8f..306f2ce11 100644
--- a/elements/boards/pinebook-pro/keyboard-updater.bst
+++ b/elements/boards/pinebook-pro/keyboard-updater.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: https://github.com/ayufan-rock64/pinebook-pro-keyboard-updater.git
+  url: github_com:ayufan-rock64/pinebook-pro-keyboard-updater.git
   track: 089ddceaca34cc835d8114900c24db6dcdf121c3
 
 depends:
diff --git a/elements/boards/pinebook-pro/linux.bst b/elements/boards/pinebook-pro/linux.bst
index aa135c1b8..fd5b3a8ba 100644
--- a/elements/boards/pinebook-pro/linux.bst
+++ b/elements/boards/pinebook-pro/linux.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: https://gitlab.manjaro.org/tsys/linux-pinebook-pro.git
+  url: gitlab_manjaro_org:tsys/linux-pinebook-pro.git
   #track: master
   track: c04087388bdb7d79d5202ffb91aa387e36901056
   track-tags: false
diff --git a/elements/boards/pinebook-pro/u-boot.bst b/elements/boards/pinebook-pro/u-boot.bst
index caff32339..ae25c249e 100644
--- a/elements/boards/pinebook-pro/u-boot.bst
+++ b/elements/boards/pinebook-pro/u-boot.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: https://git.eno.space/pbp-uboot.git
+  url: git_eno_space:pbp-uboot.git
   track: 365495a329c8e92ca4c134562d091df71b75845e
 
 build-depends:
diff --git a/elements/boards/pinebook-pro/vim.bst b/elements/boards/pinebook-pro/vim.bst
index 81f2ad2fa..ca89e01d6 100644
--- a/elements/boards/pinebook-pro/vim.bst
+++ b/elements/boards/pinebook-pro/vim.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:vim/vim/archive/v8.2.0737.tar.gz
+  url: tar_github_com:vim/vim/archive/v8.2.0737.tar.gz
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/boards/raspberrypi-4/bsp/firmware.bst b/elements/boards/raspberrypi-4/bsp/firmware.bst
index 2e9779ac2..1df483b33 100644
--- a/elements/boards/raspberrypi-4/bsp/firmware.bst
+++ b/elements/boards/raspberrypi-4/bsp/firmware.bst
@@ -7,7 +7,7 @@ build-depends:
 
 sources:
 - kind: git_tag
-  url: https://github.com/raspberrypi/firmware
+  url: github_com:raspberrypi/firmware.git
   track: 20354bebcc2a8448128f2348e19e155910d25122
   track-tags: false
 
@@ -16,7 +16,7 @@ config:
   - mkdir -p  %{install-root}/boot/
   - cp -a boot/LICENCE.broadcom %{install-root}/boot/
 
-  # https://github.com/raspberrypi/documentation/blob/master/configuration/boot_folder.md
+  # github_com:raspberrypi/documentation/blob/master/configuration/boot_folder.md
   # Default firmware, standard GPU features
   - cp -a boot/fixup4.dat %{install-root}/boot/
   - cp -a boot/start4.elf %{install-root}/boot/
diff --git a/elements/boards/raspberrypi-4/bsp/rpi-userland.bst 
b/elements/boards/raspberrypi-4/bsp/rpi-userland.bst
index f9512f115..860d53f7a 100644
--- a/elements/boards/raspberrypi-4/bsp/rpi-userland.bst
+++ b/elements/boards/raspberrypi-4/bsp/rpi-userland.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: git_tag
-  url: https://github.com/raspberrypi/userland/
+  url: github_com:raspberrypi/userland.git
   track: f97b1af1b3e653f9da2c1a3643479bfd469e3b74
 - kind: patch
   path: files/boards/raspberrypi-4/0021-cmake-Disable-format-overflow-warning-as-error.patch
diff --git a/elements/boards/raspberrypi-4/bsp/u-boot.bst b/elements/boards/raspberrypi-4/bsp/u-boot.bst
index d6b50fb9e..e483987ba 100644
--- a/elements/boards/raspberrypi-4/bsp/u-boot.bst
+++ b/elements/boards/raspberrypi-4/bsp/u-boot.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: ftp://ftp.denx.de/pub/u-boot/u-boot-2020.07-rc2.tar.bz2
+  url: tar_ftp_denx_de:pub/u-boot/u-boot-2020.07-rc2.tar.bz2
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/boards/rock64/arm-trusted-firmware.bst b/elements/boards/rock64/arm-trusted-firmware.bst
index b3465522a..8c151fff3 100644
--- a/elements/boards/rock64/arm-trusted-firmware.bst
+++ b/elements/boards/rock64/arm-trusted-firmware.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://github.com/ARM-software/arm-trusted-firmware/archive/v2.3.tar.gz
+  url: tar_github_com:ARM-software/arm-trusted-firmware/archive/v2.3.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/boards/rock64/u-boot.bst b/elements/boards/rock64/u-boot.bst
index c4b32767b..cb49ab984 100644
--- a/elements/boards/rock64/u-boot.bst
+++ b/elements/boards/rock64/u-boot.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://ftp.denx.de/pub/u-boot/u-boot-2020.04.tar.bz2
+  url: tar_ftp_denx_de:pub/u-boot/u-boot-2020.04.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:components/bison.bst
diff --git a/elements/core-deps/LibRaw.bst b/elements/core-deps/LibRaw.bst
index 13edb9457..ad8206a8e 100644
--- a/elements/core-deps/LibRaw.bst
+++ b/elements/core-deps/LibRaw.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://www.libraw.org/data/LibRaw-0.20.2.tar.gz
+  url: tar_www_libraw_org:data/LibRaw-0.20.2.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/LibVNCServer.bst b/elements/core-deps/LibVNCServer.bst
index f5eeb7f13..51c0af6ed 100644
--- a/elements/core-deps/LibVNCServer.bst
+++ b/elements/core-deps/LibVNCServer.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
+  url: tar_github_com:LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/core-deps/ModemManager.bst b/elements/core-deps/ModemManager.bst
index 9233bd893..962bdb9f6 100644
--- a/elements/core-deps/ModemManager.bst
+++ b/elements/core-deps/ModemManager.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.4.tar.xz
+  url: tar_www_freedesktop_org:software/ModemManager/ModemManager-1.18.4.tar.xz
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/NetworkManager.bst b/elements/core-deps/NetworkManager.bst
index 6cffb59e7..defbaa544 100644
--- a/elements/core-deps/NetworkManager.bst
+++ b/elements/core-deps/NetworkManager.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: gnome_downloads:NetworkManager/1.35/NetworkManager-1.35.1.tar.xz
+  url: tar_download_gnome_org:sources/NetworkManager/1.35/NetworkManager-1.35.1.tar.xz
 build-depends:
 - core-deps/intltool.bst
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/accountsservice.bst b/elements/core-deps/accountsservice.bst
index 548be4016..719027f37 100644
--- a/elements/core-deps/accountsservice.bst
+++ b/elements/core-deps/accountsservice.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.55.tar.xz
+  url: tar_www_freedesktop_org:software/accountsservice/accountsservice-0.6.55.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
diff --git a/elements/core-deps/appstream.bst b/elements/core-deps/appstream.bst
index ded83078a..efe4f6dd2 100644
--- a/elements/core-deps/appstream.bst
+++ b/elements/core-deps/appstream.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/appstream/releases/AppStream-0.14.3.tar.xz
+  url: tar_www_freedesktop_org:software/appstream/releases/AppStream-0.14.3.tar.xz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/babl.bst b/elements/core-deps/babl.bst
index d880d9891..2b57dda38 100644
--- a/elements/core-deps/babl.bst
+++ b/elements/core-deps/babl.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://download.gimp.org/pub/babl/0.1/babl-0.1.88.tar.xz
+  url: tar_download_gimp_org:pub/babl/0.1/babl-0.1.88.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/vala.bst
diff --git a/elements/core-deps/berkeleydb.bst b/elements/core-deps/berkeleydb.bst
index aba5cd736..710ff65a5 100644
--- a/elements/core-deps/berkeleydb.bst
+++ b/elements/core-deps/berkeleydb.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://http.debian.net/debian/pool/main/d/db5.3/db5.3_5.3.28.orig.tar.xz
+  url: tar_http_debian_net:debian/pool/main/d/db5.3/db5.3_5.3.28.orig.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/boost.bst b/elements/core-deps/boost.bst
index 45c0fbfa2..04a9e6e4c 100644
--- a/elements/core-deps/boost.bst
+++ b/elements/core-deps/boost.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2
+  url: tar_boostorg_jfrog_io:artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/cairomm-1.0.bst b/elements/core-deps/cairomm-1.0.bst
index 81d9f8727..1ef05feed 100644
--- a/elements/core-deps/cairomm-1.0.bst
+++ b/elements/core-deps/cairomm-1.0.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: cairo_org:releases/cairomm-1.14.3.tar.xz
+  url: tar_cairographics_org:releases/cairomm-1.14.3.tar.xz
 build-depends:
 - core-deps/mm-common.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/callaudiod.bst b/elements/core-deps/callaudiod.bst
index ce9bb6b30..3e096c986 100644
--- a/elements/core-deps/callaudiod.bst
+++ b/elements/core-deps/callaudiod.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: gitlab_com:mobian1/callaudiod/-/archive/0.1.0/callaudiod-0.1.0.tar.bz2
+  url: tar_gitlab_com:mobian1/callaudiod/-/archive/0.1.0/callaudiod-0.1.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/clutter-gst.bst b/elements/core-deps/clutter-gst.bst
index c5e0c9ca0..60eccb033 100644
--- a/elements/core-deps/clutter-gst.bst
+++ b/elements/core-deps/clutter-gst.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: gnome_downloads:clutter-gst/3.0/clutter-gst-3.0.27.tar.xz
+  url: tar_download_gnome_org:sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/clutter-gtk.bst b/elements/core-deps/clutter-gtk.bst
index 5d0f8a02d..7458a46d0 100644
--- a/elements/core-deps/clutter-gtk.bst
+++ b/elements/core-deps/clutter-gtk.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: gnome_downloads:clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz
+  url: tar_download_gnome_org:sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/clutter.bst b/elements/core-deps/clutter.bst
index 4ff155ec4..54a1f15e0 100644
--- a/elements/core-deps/clutter.bst
+++ b/elements/core-deps/clutter.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: gnome_downloads:clutter/1.26/clutter-1.26.4.tar.xz
+  url: tar_download_gnome_org:sources/clutter/1.26/clutter-1.26.4.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/cmark.bst b/elements/core-deps/cmark.bst
index e403630c9..50594197c 100644
--- a/elements/core-deps/cmark.bst
+++ b/elements/core-deps/cmark.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:commonmark/cmark/archive/refs/tags/0.30.1.tar.gz
+  url: tar_github_com:commonmark/cmark/archive/refs/tags/0.30.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/core-deps/colord-gtk.bst b/elements/core-deps/colord-gtk.bst
index 569262894..6398df83b 100644
--- a/elements/core-deps/colord-gtk.bst
+++ b/elements/core-deps/colord-gtk.bst
@@ -5,6 +5,7 @@ sources:
   url: github_com:hughsie/colord-gtk.git
   track: master
 
+
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/colord.bst b/elements/core-deps/colord.bst
index 3da26ffab..a9d5d0ccb 100644
--- a/elements/core-deps/colord.bst
+++ b/elements/core-deps/colord.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/colord/releases/colord-1.4.5.tar.xz
+  url: tar_www_freedesktop_org:software/colord/releases/colord-1.4.5.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/cups-pk-helper.bst b/elements/core-deps/cups-pk-helper.bst
index 2d854916f..840b6c9ca 100644
--- a/elements/core-deps/cups-pk-helper.bst
+++ b/elements/core-deps/cups-pk-helper.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.6.tar.xz
+  url: tar_www_freedesktop_org:software/cups-pk-helper/releases/cups-pk-helper-0.2.6.tar.xz
 - kind: local
   path: files/cups-pk-helper/cups-pk-helper.service
 
diff --git a/elements/core-deps/dnsmasq.bst b/elements/core-deps/dnsmasq.bst
index 892a8ffed..f0ee2d011 100644
--- a/elements/core-deps/dnsmasq.bst
+++ b/elements/core-deps/dnsmasq.bst
@@ -2,7 +2,7 @@ kind: make
 
 sources:
 - kind: tar
-  url: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.86.tar.xz
+  url: tar_www_thekelleys_org_uk:dnsmasq/dnsmasq-2.86.tar.xz
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/dotconf.bst b/elements/core-deps/dotconf.bst
index 7b69cb37e..66c8528f8 100644
--- a/elements/core-deps/dotconf.bst
+++ b/elements/core-deps/dotconf.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:williamh/dotconf/archive/v1.3.tar.gz
+  url: tar_github_com:williamh/dotconf/archive/v1.3.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/ebtables.bst b/elements/core-deps/ebtables.bst
index 56bef9c7c..48073bf9d 100644
--- a/elements/core-deps/ebtables.bst
+++ b/elements/core-deps/ebtables.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz
+  url: tar_ftp_netfilter_org:pub/ebtables/ebtables-2.0.11.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 645d41201..e66720035 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:endlessm/eos-updater/archive/Release_3.9.4.tar.gz
+  url: tar_github_com:endlessm/eos-updater/archive/Release_3.9.4.tar.gz
 
 depends:
 - core-deps/NetworkManager.bst
diff --git a/elements/core-deps/espeak.bst b/elements/core-deps/espeak.bst
index 03f796f90..35cdb4a3f 100644
--- a/elements/core-deps/espeak.bst
+++ b/elements/core-deps/espeak.bst
@@ -1,7 +1,7 @@
 kind: manual
 sources:
 - kind: zip
-  url: sourceforge_net:espeak/files/espeak/espeak-1.48/espeak-1.48.04-source.zip
+  url: https://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/espeak-1.48.04-source.zip
 depends:
 - core-deps/portaudio.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/exempi.bst b/elements/core-deps/exempi.bst
index d5c6c87f2..bb03a8069 100644
--- a/elements/core-deps/exempi.bst
+++ b/elements/core-deps/exempi.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://libopenraw.freedesktop.org/download/exempi-2.5.2.tar.bz2
+  url: tar_libopenraw_freedesktop_org:download/exempi-2.5.2.tar.bz2
 build-depends:
 - freedesktop-sdk.bst:components/expat.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/exiv2.bst b/elements/core-deps/exiv2.bst
index 2a8692087..bed3b5d78 100644
--- a/elements/core-deps/exiv2.bst
+++ b/elements/core-deps/exiv2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:Exiv2/exiv2/archive/v0.27.3.tar.gz
+  url: tar_github_com:Exiv2/exiv2/archive/v0.27.3.tar.gz
 - kind: patch
   path: files/exiv2/disable-protection-flags.patch
 build-depends:
diff --git a/elements/core-deps/feedbackd.bst b/elements/core-deps/feedbackd.bst
index 98d1c4a82..0d4066286 100644
--- a/elements/core-deps/feedbackd.bst
+++ b/elements/core-deps/feedbackd.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: 
https://source.puri.sm/Librem5/feedbackd/-/archive/v0.0.0+git20210426/feedbackd-v0.0.0+git20210426.tar.bz2
+  url: tar_source_puri_sm:Librem5/feedbackd/-/archive/v0.0.0+git20210426/feedbackd-v0.0.0+git20210426.tar.bz2
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/flatpak-builder.bst b/elements/core-deps/flatpak-builder.bst
index b83735804..94f54e9bc 100644
--- a/elements/core-deps/flatpak-builder.bst
+++ b/elements/core-deps/flatpak-builder.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:flatpak/flatpak-builder/releases/download/1.2.0/flatpak-builder-1.2.0.tar.xz
+  url: tar_github_com:flatpak/flatpak-builder/releases/download/1.2.0/flatpak-builder-1.2.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:components/docbook-xsl.bst
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index 1c31fa896..b2e41e9f8 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:flatpak/flatpak/releases/download/1.12.1/flatpak-1.12.1.tar.xz
+  url: tar_github_com:flatpak/flatpak/releases/download/1.12.1/flatpak-1.12.1.tar.xz
 
 build-depends:
 - core-deps/python-pyparsing.bst
diff --git a/elements/core-deps/freerdp.bst b/elements/core-deps/freerdp.bst
index 13b9af662..463058c16 100644
--- a/elements/core-deps/freerdp.bst
+++ b/elements/core-deps/freerdp.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: https://pub.freerdp.com/releases/freerdp-2.4.1.tar.gz
+  url: tar_pub_freerdp_com:releases/freerdp-2.4.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/core-deps/fwupd-efi.bst b/elements/core-deps/fwupd-efi.bst
index 231b75bed..5f5f22888 100644
--- a/elements/core-deps/fwupd-efi.bst
+++ b/elements/core-deps/fwupd-efi.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:fwupd/fwupd-efi/archive/1.0.tar.gz
+  url: tar_github_com:fwupd/fwupd-efi/archive/1.0.tar.gz
 - kind: patch
   path: files/fwupd/riscv64.patch
 
diff --git a/elements/core-deps/fwupd.bst b/elements/core-deps/fwupd.bst
index 2f8799b2d..6a89c7629 100644
--- a/elements/core-deps/fwupd.bst
+++ b/elements/core-deps/fwupd.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:fwupd/fwupd/releases/download/1.7.2/fwupd-1.7.2.tar.xz
+  url: tar_github_com:fwupd/fwupd/releases/download/1.7.2/fwupd-1.7.2.tar.xz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index 44c284c28..59762c6b9 100644
--- a/elements/core-deps/gegl.bst
+++ b/elements/core-deps/gegl.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://download.gimp.org/pub/gegl/0.4/gegl-0.4.32.tar.xz
+  url: tar_download_gimp_org:pub/gegl/0.4/gegl-0.4.32.tar.xz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gexiv2.bst b/elements/core-deps/gexiv2.bst
index e31a9c036..2a47f17b4 100644
--- a/elements/core-deps/gexiv2.bst
+++ b/elements/core-deps/gexiv2.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: gnome_downloads:gexiv2/0.14/gexiv2-0.14.0.tar.xz
+  url: tar_download_gnome_org:sources/gexiv2/0.14/gexiv2-0.14.0.tar.xz
 
 build-depends:
 - sdk/pygobject.bst
diff --git a/elements/core-deps/glib-testing.bst b/elements/core-deps/glib-testing.bst
index 831efac6b..10d06f813 100644
--- a/elements/core-deps/glib-testing.bst
+++ b/elements/core-deps/glib-testing.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://tecnocode.co.uk/downloads/libglib-testing-0.1.0.tar.xz
+  url: tar_tecnocode_co_uk:downloads/libglib-testing-0.1.0.tar.xz
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/graphviz.bst b/elements/core-deps/graphviz.bst
index 384dcb3cd..cec5ec414 100644
--- a/elements/core-deps/graphviz.bst
+++ b/elements/core-deps/graphviz.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gitlab_com:graphviz/graphviz/-/archive/2.47.1/graphviz-2.47.1.tar.gz
+  url: tar_gitlab_com:graphviz/graphviz/-/archive/2.47.1/graphviz-2.47.1.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gst-editing-services.bst b/elements/core-deps/gst-editing-services.bst
index d4e491b46..4d0132926 100644
--- a/elements/core-deps/gst-editing-services.bst
+++ b/elements/core-deps/gst-editing-services.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: 
https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.16.3.tar.xz
+  url: tar_gstreamer_freedesktop_org:src/gstreamer-editing-services/gstreamer-editing-services-1.16.3.tar.xz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/intltool.bst b/elements/core-deps/intltool.bst
index d063c0c03..151c99dd7 100644
--- a/elements/core-deps/intltool.bst
+++ b/elements/core-deps/intltool.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
+  url: tar_launchpad_net:intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
 - kind: patch
   path: files/intltool/intltool-perl-5.22-compatibility.patch
 build-depends:
diff --git a/elements/core-deps/libbluray.bst b/elements/core-deps/libbluray.bst
index 72f8e39a4..4d6474c54 100644
--- a/elements/core-deps/libbluray.bst
+++ b/elements/core-deps/libbluray.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://ftp.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2
+  url: tar_ftp_videolan_org:pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libcacard.bst b/elements/core-deps/libcacard.bst
index 897163b0d..bc406079c 100644
--- a/elements/core-deps/libcacard.bst
+++ b/elements/core-deps/libcacard.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: 
https://gitlab.freedesktop.org/spice/libcacard/uploads/9d8f24b131bcbbd7846727ea92952cb5/libcacard-2.8.0.tar.xz
+  url: 
tar_gitlab_freedesktop_org:spice/libcacard/uploads/9d8f24b131bcbbd7846727ea92952cb5/libcacard-2.8.0.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
diff --git a/elements/core-deps/libcanberra.bst b/elements/core-deps/libcanberra.bst
index 30fc4f106..b439d9c9e 100644
--- a/elements/core-deps/libcanberra.bst
+++ b/elements/core-deps/libcanberra.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: tarballs_needing_help:libcanberra-0.30.tar.xz
+  url: tar_people_gnome_org:~mcatanzaro/tarballs-needing-help/libcanberra-0.30.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libcap-ng.bst b/elements/core-deps/libcap-ng.bst
index 65f30a5a5..4f5082a81 100644
--- a/elements/core-deps/libcap-ng.bst
+++ b/elements/core-deps/libcap-ng.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz
+  url: tar_people_redhat_com:sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libcdio-paranoia.bst b/elements/core-deps/libcdio-paranoia.bst
index 5c5749fea..3a8a1a351 100644
--- a/elements/core-deps/libcdio-paranoia.bst
+++ b/elements/core-deps/libcdio-paranoia.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: ftp_gnu_org:libcdio/libcdio-paranoia-10.2+2.0.1.tar.gz
+  url: tar_ftp_gnu_org:gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libcdio.bst b/elements/core-deps/libcdio.bst
index 7b4570c89..ed3d6033a 100644
--- a/elements/core-deps/libcdio.bst
+++ b/elements/core-deps/libcdio.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: ftp_gnu_org:libcdio/libcdio-2.1.0.tar.bz2
+  url: tar_ftp_gnu_org:gnu/libcdio/libcdio-2.1.0.tar.bz2
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libcue.bst b/elements/core-deps/libcue.bst
index cf5bdb0b1..9f96544b7 100644
--- a/elements/core-deps/libcue.bst
+++ b/elements/core-deps/libcue.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: https://github.com/lipnitsk/libcue/archive/v2.2.1.tar.gz
+  url: tar_github_com:lipnitsk/libcue/archive/v2.2.1.tar.gz
 build-depends:
 - freedesktop-sdk.bst:components/bison.bst
 - freedesktop-sdk.bst:components/flex.bst
diff --git a/elements/core-deps/libdvdread.bst b/elements/core-deps/libdvdread.bst
index 5927188a8..ac73fc90b 100644
--- a/elements/core-deps/libdvdread.bst
+++ b/elements/core-deps/libdvdread.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://download.videolan.org/pub/videolan/libdvdread/6.1.2/libdvdread-6.1.2.tar.bz2
+  url: tar_download_videolan_org:pub/videolan/libdvdread/6.1.2/libdvdread-6.1.2.tar.bz2
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libgit2.bst b/elements/core-deps/libgit2.bst
index 98ea1839a..5ded6d1e6 100644
--- a/elements/core-deps/libgit2.bst
+++ b/elements/core-deps/libgit2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:libgit2/libgit2/archive/v1.1.0.tar.gz
+  url: tar_github_com:libgit2/libgit2/archive/v1.1.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/core-deps/libgphoto2.bst b/elements/core-deps/libgphoto2.bst
index a9a61d35e..2d3f5db19 100644
--- a/elements/core-deps/libgphoto2.bst
+++ b/elements/core-deps/libgphoto2.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz
+  url: tar_github_com:gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libgusb.bst b/elements/core-deps/libgusb.bst
index 2a6b68efd..4087fac99 100644
--- a/elements/core-deps/libgusb.bst
+++ b/elements/core-deps/libgusb.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: people_freedesktop_org:~hughsient/releases/libgusb-0.3.8.tar.xz
+  url: tar_people_freedesktop_org:~hughsient/releases/libgusb-0.3.8.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/libgweather.bst b/elements/core-deps/libgweather.bst
index e0079b36f..466edbd38 100644
--- a/elements/core-deps/libgweather.bst
+++ b/elements/core-deps/libgweather.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: gnome_downloads:libgweather/40/libgweather-40.0.tar.xz
+  url: tar_download_gnome_org:sources/libgweather/40/libgweather-40.0.tar.xz
 build-depends:
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/libimobiledevice.bst b/elements/core-deps/libimobiledevice.bst
index 9666d50a8..4a69c17eb 100644
--- a/elements/core-deps/libimobiledevice.bst
+++ b/elements/core-deps/libimobiledevice.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
+  url: 
tar_github_com:libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libinput.bst b/elements/core-deps/libinput.bst
index c82077146..c27039609 100644
--- a/elements/core-deps/libinput.bst
+++ b/elements/core-deps/libinput.bst
@@ -19,4 +19,4 @@ variables:
     -Dzshcompletiondir=no
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/libinput/libinput-1.19.2.tar.xz
+  url: tar_www_freedesktop_org:software/libinput/libinput-1.19.2.tar.xz
diff --git a/elements/core-deps/libjcat.bst b/elements/core-deps/libjcat.bst
index 565523c05..ef1bee2d4 100644
--- a/elements/core-deps/libjcat.bst
+++ b/elements/core-deps/libjcat.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:hughsie/libjcat/archive/0.1.6.tar.gz
+  url: tar_github_com:hughsie/libjcat/archive/0.1.6.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libmbim.bst b/elements/core-deps/libmbim.bst
index e0b86a791..1e3d8e32f 100644
--- a/elements/core-deps/libmbim.bst
+++ b/elements/core-deps/libmbim.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/libmbim/libmbim-1.26.2.tar.xz
+  url: tar_www_freedesktop_org:software/libmbim/libmbim-1.26.2.tar.xz
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libmtp.bst b/elements/core-deps/libmtp.bst
index 4be1b7e5f..f3e4312b8 100644
--- a/elements/core-deps/libmtp.bst
+++ b/elements/core-deps/libmtp.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: downloads.sourceforge.net:libmtp/libmtp/1.1.18/libmtp-1.1.18.tar.gz
+  url: tar_downloads_sourceforge_net:libmtp/libmtp/1.1.18/libmtp-1.1.18.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libmusicbrainz.bst b/elements/core-deps/libmusicbrainz.bst
index 2630da845..c5f512644 100644
--- a/elements/core-deps/libmusicbrainz.bst
+++ b/elements/core-deps/libmusicbrainz.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz
+  url: tar_github_com:metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz
 # this patch has been merged upstream and can be removed when this is updated
 - kind: patch
   path: files/libmusicbrainz/cmake-ninja.patch
diff --git a/elements/core-deps/libnfs.bst b/elements/core-deps/libnfs.bst
index 0f6de0971..85b3830e4 100644
--- a/elements/core-deps/libnfs.bst
+++ b/elements/core-deps/libnfs.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://sites.google.com/site/libnfstarballs/li/libnfs-2.0.0.tar.gz
+  url: tar_sites_google_com:site/libnfstarballs/li/libnfs-2.0.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/liboauth.bst b/elements/core-deps/liboauth.bst
index 8541c7019..75f65a8d6 100644
--- a/elements/core-deps/liboauth.bst
+++ b/elements/core-deps/liboauth.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: downloads.sourceforge.net:liboauth/liboauth-1.0.3.tar.gz
+  url: tar_downloads_sourceforge_net:liboauth/liboauth-1.0.3.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libosinfo.bst b/elements/core-deps/libosinfo.bst
index 8ca1a1278..0e058aaea 100644
--- a/elements/core-deps/libosinfo.bst
+++ b/elements/core-deps/libosinfo.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://releases.pagure.org/libosinfo/libosinfo-1.9.0.tar.xz
+  url: tar_releases_pagure_org:libosinfo/libosinfo-1.9.0.tar.xz
 - kind: local
   path: files/libosinfo/pci.ids
 - kind: local
diff --git a/elements/core-deps/libostree.bst b/elements/core-deps/libostree.bst
index a1fd476c8..65f2f144d 100644
--- a/elements/core-deps/libostree.bst
+++ b/elements/core-deps/libostree.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:ostreedev/ostree/releases/download/v2021.5/libostree-2021.5.tar.xz
+  url: tar_github_com:ostreedev/ostree/releases/download/v2021.5/libostree-2021.5.tar.xz
 - kind: patch
   path: files/ostree/no-boot-symlink.patch
 - kind: patch
diff --git a/elements/core-deps/libpcap.bst b/elements/core-deps/libpcap.bst
index 0ad204563..be5e6e51d 100644
--- a/elements/core-deps/libpcap.bst
+++ b/elements/core-deps/libpcap.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz
+  url: tar_www_tcpdump_org:release/libpcap-1.10.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/bison.bst
diff --git a/elements/core-deps/libqmi.bst b/elements/core-deps/libqmi.bst
index fa6b81f4d..712c697a4 100644
--- a/elements/core-deps/libqmi.bst
+++ b/elements/core-deps/libqmi.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/libqmi/libqmi-1.30.2.tar.xz
+  url: tar_www_freedesktop_org:software/libqmi/libqmi-1.30.2.tar.xz
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libssh2.bst b/elements/core-deps/libssh2.bst
index 4b5e0c7a3..c80dacc0d 100644
--- a/elements/core-deps/libssh2.bst
+++ b/elements/core-deps/libssh2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:libssh2/libssh2/archive/libssh2-1.9.0.tar.gz
+  url: tar_github_com:libssh2/libssh2/archive/libssh2-1.9.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/core-deps/libusbmuxd.bst b/elements/core-deps/libusbmuxd.bst
index a197d4d21..3215a4693 100644
--- a/elements/core-deps/libusbmuxd.bst
+++ b/elements/core-deps/libusbmuxd.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://github.com/libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2
+  url: tar_github_com:libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libvirt-glib.bst b/elements/core-deps/libvirt-glib.bst
index d0be87893..0c7e6b3b3 100644
--- a/elements/core-deps/libvirt-glib.bst
+++ b/elements/core-deps/libvirt-glib.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://libvirt.org/sources/glib/libvirt-glib-4.0.0.tar.xz
+  url: tar_libvirt_org:sources/glib/libvirt-glib-4.0.0.tar.xz
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/libvirt.bst b/elements/core-deps/libvirt.bst
index f62a7120a..892ce727b 100644
--- a/elements/core-deps/libvirt.bst
+++ b/elements/core-deps/libvirt.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://libvirt.org/sources/libvirt-7.9.0.tar.xz
+  url: tar_libvirt_org:sources/libvirt-7.9.0.tar.xz
 - kind: local
   path: files/libvirt/80-libvirt.preset
 build-depends:
diff --git a/elements/core-deps/libxcvt.bst b/elements/core-deps/libxcvt.bst
index 9ab8484ed..e4554c761 100644
--- a/elements/core-deps/libxcvt.bst
+++ b/elements/core-deps/libxcvt.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: git_freedesktop_org:xorg/lib/libxcvt/-/archive/libxcvt-0.1.1/libxcvt-libxcvt-0.1.1.tar.bz2
+  url: tar_gitlab_freedesktop_org:xorg/lib/libxcvt/-/archive/libxcvt-0.1.1/libxcvt-libxcvt-0.1.1.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/libxklavier.bst b/elements/core-deps/libxklavier.bst
index e1000118c..c19fb6217 100644
--- a/elements/core-deps/libxklavier.bst
+++ b/elements/core-deps/libxklavier.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: people_freedesktop_org:~svu/libxklavier-5.4.tar.bz2
+  url: tar_people_freedesktop_org:~svu/libxklavier-5.4.tar.bz2
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/lmdb.bst b/elements/core-deps/lmdb.bst
index 667a524c4..667361da7 100644
--- a/elements/core-deps/lmdb.bst
+++ b/elements/core-deps/lmdb.bst
@@ -15,4 +15,4 @@ config:
 
 sources:
 - kind: tar
-  url: github_com:LMDB/lmdb/archive/LMDB_0.9.28.tar.gz
+  url: tar_github_com:LMDB/lmdb/archive/LMDB_0.9.28.tar.gz
diff --git a/elements/core-deps/malcontent.bst b/elements/core-deps/malcontent.bst
index 9e16e5a51..f9e8cc757 100644
--- a/elements/core-deps/malcontent.bst
+++ b/elements/core-deps/malcontent.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://tecnocode.co.uk/downloads/malcontent-0.10.1.tar.xz
+  url: tar_tecnocode_co_uk:downloads/malcontent-0.10.1.tar.xz
 
 build-depends:
 - core-deps/glib-testing.bst
diff --git a/elements/core-deps/mogwai.bst b/elements/core-deps/mogwai.bst
index 3c2a58143..f37e18335 100644
--- a/elements/core-deps/mogwai.bst
+++ b/elements/core-deps/mogwai.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:endlessm/mogwai/archive/Release_3.9.4.tar.gz
+  url: tar_github_com:endlessm/mogwai/archive/Release_3.9.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/mpc.bst b/elements/core-deps/mpc.bst
index 73b52fc70..b3edf5675 100644
--- a/elements/core-deps/mpc.bst
+++ b/elements/core-deps/mpc.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: ftp_gnu_org:mpc/mpc-1.2.1.tar.gz
+  url: tar_ftp_gnu_org:gnu/mpc/mpc-1.2.1.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/neon.bst b/elements/core-deps/neon.bst
index 9212d9649..7432690c5 100644
--- a/elements/core-deps/neon.bst
+++ b/elements/core-deps/neon.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://notroj.github.io/neon/neon-0.31.2.tar.gz
+  url: tar_notroj_github_io:neon/neon-0.31.2.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/osinfo-db-tools.bst b/elements/core-deps/osinfo-db-tools.bst
index bc5746ed2..2bc9e0c39 100644
--- a/elements/core-deps/osinfo-db-tools.bst
+++ b/elements/core-deps/osinfo-db-tools.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz
+  url: tar_releases_pagure_org:libosinfo/osinfo-db-tools-1.9.0.tar.xz
 build-depends:
 - freedesktop-sdk.bst:components/libxslt.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
diff --git a/elements/core-deps/osinfo-db.bst b/elements/core-deps/osinfo-db.bst
index f467be2a9..8b177a2aa 100644
--- a/elements/core-deps/osinfo-db.bst
+++ b/elements/core-deps/osinfo-db.bst
@@ -1,7 +1,7 @@
 kind: manual
 sources:
 - kind: remote
-  url: https://releases.pagure.org/libosinfo/osinfo-db-20211013.tar.xz
+  url: tar_releases_pagure_org:libosinfo/osinfo-db-20211013.tar.xz
 build-depends:
 - core-deps/osinfo-db-tools.bst
 
diff --git a/elements/core-deps/perl-parse-yapp.bst b/elements/core-deps/perl-parse-yapp.bst
index 6db1ac3d2..414c3b58e 100644
--- a/elements/core-deps/perl-parse-yapp.bst
+++ b/elements/core-deps/perl-parse-yapp.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz
+  url: tar_cpan_metacpan_org:authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz
 
 depends:
 - freedesktop-sdk.bst:components/perl.bst
diff --git a/elements/core-deps/plist.bst b/elements/core-deps/plist.bst
index 33bcdc1bf..146e523f5 100644
--- a/elements/core-deps/plist.bst
+++ b/elements/core-deps/plist.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://github.com/libimobiledevice/libplist/releases/download/2.2.0/libplist-2.2.0.tar.bz2
+  url: tar_github_com:libimobiledevice/libplist/releases/download/2.2.0/libplist-2.2.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/plymouth.bst b/elements/core-deps/plymouth.bst
index 8cf772f25..d71383595 100644
--- a/elements/core-deps/plymouth.bst
+++ b/elements/core-deps/plymouth.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.5.tar.xz
+  url: tar_www_freedesktop_org:software/plymouth/releases/plymouth-0.9.5.tar.xz
 - kind: patch
   path: files/plymouth/plymouth-stdin.patch
 
diff --git a/elements/core-deps/portaudio.bst b/elements/core-deps/portaudio.bst
index ec2e485aa..3613d8e78 100644
--- a/elements/core-deps/portaudio.bst
+++ b/elements/core-deps/portaudio.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:PortAudio/portaudio/archive/refs/tags/v19.7.0.tar.gz
+  url: tar_github_com:PortAudio/portaudio/archive/refs/tags/v19.7.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/core-deps/power-profiles-daemon.bst b/elements/core-deps/power-profiles-daemon.bst
index b71a482b9..b382c24d8 100644
--- a/elements/core-deps/power-profiles-daemon.bst
+++ b/elements/core-deps/power-profiles-daemon.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: 
git_freedesktop_org:hadess/power-profiles-daemon/uploads/329f1ed3b068f6c59b8441f01a4e711a/power-profiles-daemon-0.8.1.tar.xz
+  url: 
tar_gitlab_freedesktop_org:hadess/power-profiles-daemon/uploads/329f1ed3b068f6c59b8441f01a4e711a/power-profiles-daemon-0.8.1.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/ppp.bst b/elements/core-deps/ppp.bst
index d0583f1ff..df4526685 100644
--- a/elements/core-deps/ppp.bst
+++ b/elements/core-deps/ppp.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://download.samba.org/pub/ppp/ppp-2.4.9.tar.gz
+  url: tar_download_samba_org:pub/ppp/ppp-2.4.9.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/protobuf.bst b/elements/core-deps/protobuf.bst
index 7f6ef8287..9e33ce048 100644
--- a/elements/core-deps/protobuf.bst
+++ b/elements/core-deps/protobuf.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz
+  url: tar_github_com:protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/core-deps/pycups.bst b/elements/core-deps/pycups.bst
index ac225c6ba..c452dd106 100644
--- a/elements/core-deps/pycups.bst
+++ b/elements/core-deps/pycups.bst
@@ -1,7 +1,7 @@
 kind: distutils
 sources:
 - kind: tar
-  url: http://cyberelk.net/tim/data/pycups/pycups-1.9.73.tar.bz2
+  url: tar_cyberelk_net:tim/data/pycups/pycups-1.9.73.tar.bz2
 
 depends:
 - freedesktop-sdk.bst:components/cups.bst
diff --git a/elements/core-deps/python-pyparsing.bst b/elements/core-deps/python-pyparsing.bst
index 61a8f7eb2..670317611 100644
--- a/elements/core-deps/python-pyparsing.bst
+++ b/elements/core-deps/python-pyparsing.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210/pyparsing-2.4.7.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210/pyparsing-2.4.7.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/core-deps/qemu.bst b/elements/core-deps/qemu.bst
index be229b78b..d3a411e77 100644
--- a/elements/core-deps/qemu.bst
+++ b/elements/core-deps/qemu.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://download.qemu.org/qemu-6.1.0.tar.xz
+  url: tar_download_qemu_org:qemu-6.1.0.tar.xz
 
 build-depends:
 - core-deps/spice-protocol.bst
diff --git a/elements/core-deps/rpcsvc-proto.bst b/elements/core-deps/rpcsvc-proto.bst
index 68fff49a7..cbaed3efc 100644
--- a/elements/core-deps/rpcsvc-proto.bst
+++ b/elements/core-deps/rpcsvc-proto.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:thkukuk/rpcsvc-proto/archive/v1.4.2.tar.gz
+  url: tar_github_com:thkukuk/rpcsvc-proto/archive/v1.4.2.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/samba.bst b/elements/core-deps/samba.bst
index f030e2cad..2ccb5c409 100644
--- a/elements/core-deps/samba.bst
+++ b/elements/core-deps/samba.bst
@@ -1,7 +1,7 @@
 kind: manual
 sources:
 - kind: tar
-  url: https://download.samba.org/pub/samba/stable/samba-4.15.2.tar.gz
+  url: tar_download_samba_org:pub/samba/stable/samba-4.15.2.tar.gz
 - kind: patch
   path: files/samba/fix-root-build.patch
 build-depends:
diff --git a/elements/core-deps/sane-backends.bst b/elements/core-deps/sane-backends.bst
index 874effeee..656bcb81d 100644
--- a/elements/core-deps/sane-backends.bst
+++ b/elements/core-deps/sane-backends.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz
+  url: 
tar_gitlab_com:sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3.bst
diff --git a/elements/core-deps/sofia-sip.bst b/elements/core-deps/sofia-sip.bst
index ae0aaad53..09d2de986 100644
--- a/elements/core-deps/sofia-sip.bst
+++ b/elements/core-deps/sofia-sip.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:freeswitch/sofia-sip/archive/refs/tags/v1.13.4.tar.gz
+  url: tar_github_com:freeswitch/sofia-sip/archive/refs/tags/v1.13.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/speech-dispatcher.bst b/elements/core-deps/speech-dispatcher.bst
index 456d314c3..79d33caf0 100644
--- a/elements/core-deps/speech-dispatcher.bst
+++ b/elements/core-deps/speech-dispatcher.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:brailcom/speechd/releases/download/0.10.2/speech-dispatcher-0.10.2.tar.gz
+  url: tar_github_com:brailcom/speechd/releases/download/0.10.2/speech-dispatcher-0.10.2.tar.gz
 - kind: patch
   path: files/speech-dispatcher/Fix-build-after-glib-e38982df.patch
 build-depends:
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index a18619367..9061458c3 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: spice:gtk/spice-gtk-0.39.tar.xz
+  url: tar_www_spice-space_org:download/gtk/spice-gtk-0.39.tar.xz
 
 build-depends:
 - core-deps/python-pyparsing.bst
diff --git a/elements/core-deps/spice-protocol.bst b/elements/core-deps/spice-protocol.bst
index 159083145..f9f8c08d3 100644
--- a/elements/core-deps/spice-protocol.bst
+++ b/elements/core-deps/spice-protocol.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: spice:releases/spice-protocol-0.14.3.tar.xz
+  url: tar_www_spice-space_org:download/releases/spice-protocol-0.14.3.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
diff --git a/elements/core-deps/spice.bst b/elements/core-deps/spice.bst
index cbc755ea9..cf369d73e 100644
--- a/elements/core-deps/spice.bst
+++ b/elements/core-deps/spice.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: spice:releases/spice-server/spice-0.15.0.tar.bz2
+  url: tar_www_spice-space_org:download/releases/spice-server/spice-0.15.0.tar.bz2
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 - core-deps/spice-protocol.bst
diff --git a/elements/core-deps/startup-notification.bst b/elements/core-deps/startup-notification.bst
index 1f3c396cb..6d734ff14 100644
--- a/elements/core-deps/startup-notification.bst
+++ b/elements/core-deps/startup-notification.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: gnome_downloads:startup-notification/0.12/startup-notification-0.12.tar.xz
+  url: tar_download_gnome_org:sources/startup-notification/0.12/startup-notification-0.12.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/system-config-printer.bst b/elements/core-deps/system-config-printer.bst
index 56b7c9183..ade9f2907 100644
--- a/elements/core-deps/system-config-printer.bst
+++ b/elements/core-deps/system-config-printer.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://github.com/OpenPrinting/system-config-printer/releases/download/v1.5.15/system-config-printer-1.5.15.tar.xz
+  url: 
tar_github_com:OpenPrinting/system-config-printer/releases/download/v1.5.15/system-config-printer-1.5.15.tar.xz
 
 build-depends:
 - core-deps/intltool.bst
diff --git a/elements/core-deps/udisks2.bst b/elements/core-deps/udisks2.bst
index 8d7ab43e2..612d59605 100644
--- a/elements/core-deps/udisks2.bst
+++ b/elements/core-deps/udisks2.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
+  url: tar_github_com:storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/uhttpmock.bst b/elements/core-deps/uhttpmock.bst
index 3ff01aa2d..6cb5edf7f 100644
--- a/elements/core-deps/uhttpmock.bst
+++ b/elements/core-deps/uhttpmock.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.3.tar.xz
+  url: tar_tecnocode_co_uk:downloads/uhttpmock/uhttpmock-0.5.3.tar.xz
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/upower.bst b/elements/core-deps/upower.bst
index 5e9375446..c56b4f67d 100644
--- a/elements/core-deps/upower.bst
+++ b/elements/core-deps/upower.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz
+  url: 
tar_gitlab_freedesktop_org:upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/usbredir.bst b/elements/core-deps/usbredir.bst
index fee8ba9c0..b14c69e7c 100644
--- a/elements/core-deps/usbredir.bst
+++ b/elements/core-deps/usbredir.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: spice:usbredir/usbredir-0.12.0.tar.xz
+  url: tar_www_spice-space_org:download/usbredir/usbredir-0.12.0.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 - core-deps/spice-protocol.bst
diff --git a/elements/core-deps/virglrenderer.bst b/elements/core-deps/virglrenderer.bst
index 714064c21..ac009d3a1 100644
--- a/elements/core-deps/virglrenderer.bst
+++ b/elements/core-deps/virglrenderer.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: 
https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-0.9.1/virglrenderer-virglrenderer-0.9.1.tar.bz2
+  url: 
tar_gitlab_freedesktop_org:virgl/virglrenderer/-/archive/virglrenderer-0.9.1/virglrenderer-virglrenderer-0.9.1.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/xdg-desktop-portal-gtk.bst b/elements/core-deps/xdg-desktop-portal-gtk.bst
index e723e11eb..b997d46d9 100644
--- a/elements/core-deps/xdg-desktop-portal-gtk.bst
+++ b/elements/core-deps/xdg-desktop-portal-gtk.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
github_com:flatpak/xdg-desktop-portal-gtk/releases/download/1.10.0/xdg-desktop-portal-gtk-1.10.0.tar.xz
+  url: 
tar_github_com:flatpak/xdg-desktop-portal-gtk/releases/download/1.10.0/xdg-desktop-portal-gtk-1.10.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/xdg-sound-theme.bst b/elements/core-deps/xdg-sound-theme.bst
index f162f55ed..956bbefcd 100644
--- a/elements/core-deps/xdg-sound-theme.bst
+++ b/elements/core-deps/xdg-sound-theme.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: people_freedesktop_org:~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2
+  url: tar_people_freedesktop_org:~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/xmlb.bst b/elements/core-deps/xmlb.bst
index 48d444409..c8df8d84f 100644
--- a/elements/core-deps/xmlb.bst
+++ b/elements/core-deps/xmlb.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://github.com/hughsie/libxmlb/archive/0.3.2.tar.gz
+  url: tar_github_com:hughsie/libxmlb/archive/0.3.2.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 28626d767..bcbd88ca7 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -1,7 +1,7 @@
 kind: junction
 sources:
 - kind: git_tag
-  url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
+  url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
   track: release/21.08
   track-tags: true
 config:
diff --git a/elements/iso/isomd5sum.bst b/elements/iso/isomd5sum.bst
index 8a08975aa..7c9698fcf 100644
--- a/elements/iso/isomd5sum.bst
+++ b/elements/iso/isomd5sum.bst
@@ -2,7 +2,7 @@ kind: make
 
 sources:
 - kind: tar
-  url: github_com:rhinstaller/isomd5sum/archive/1.2.3.tar.gz
+  url: tar_github_com:rhinstaller/isomd5sum/archive/1.2.3.tar.gz
 
 depends:
 - freedesktop-sdk.bst:components/popt.bst
diff --git a/elements/iso/libburn.bst b/elements/iso/libburn.bst
index 7a28a2ad7..263c73145 100644
--- a/elements/iso/libburn.bst
+++ b/elements/iso/libburn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: libburnia:libburn-1.5.4.tar.gz
+  url: tar_files_libburnia-project_org:releases/libburn-1.5.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/iso/libisoburn.bst b/elements/iso/libisoburn.bst
index 80fec8df6..66b8a88b5 100644
--- a/elements/iso/libisoburn.bst
+++ b/elements/iso/libisoburn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: libburnia:libisoburn-1.5.4.tar.gz
+  url: tar_files_libburnia-project_org:releases/libisoburn-1.5.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/iso/libisofs.bst b/elements/iso/libisofs.bst
index 86197dd35..6decb21d6 100644
--- a/elements/iso/libisofs.bst
+++ b/elements/iso/libisofs.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: libburnia:libisofs-1.5.4.tar.gz
+  url: tar_files_libburnia-project_org:releases/libisofs-1.5.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/bubblewrap.bst b/elements/sdk-deps/bubblewrap.bst
index e46cadca1..9feee2185 100644
--- a/elements/sdk-deps/bubblewrap.bst
+++ b/elements/sdk-deps/bubblewrap.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
+  url: tar_github_com:containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/ibus.bst b/elements/sdk-deps/ibus.bst
index 84aa48725..6ac234d43 100644
--- a/elements/sdk-deps/ibus.bst
+++ b/elements/sdk-deps/ibus.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:ibus/ibus/releases/download/1.5.25/ibus-1.5.25.tar.gz
+  url: tar_github_com:ibus/ibus/releases/download/1.5.25/ibus-1.5.25.tar.gz
 
 build-depends:
 - sdk/vala.bst
diff --git a/elements/sdk-deps/libsass.bst b/elements/sdk-deps/libsass.bst
index 000c7308c..1467bd2db 100644
--- a/elements/sdk-deps/libsass.bst
+++ b/elements/sdk-deps/libsass.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://github.com/sass/libsass/archive/3.6.4.tar.gz
+  url: tar_github_com:sass/libsass/archive/3.6.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/python-smartypants.bst b/elements/sdk-deps/python-smartypants.bst
index fad3d8f34..a8085283d 100644
--- a/elements/sdk-deps/python-smartypants.bst
+++ b/elements/sdk-deps/python-smartypants.bst
@@ -2,7 +2,7 @@ kind: pip
 
 sources:
 - kind: tar
-  url: github_com:leohemsted/smartypants.py/archive/refs/tags/v2.0.1.tar.gz
+  url: tar_github_com:leohemsted/smartypants.py/archive/refs/tags/v2.0.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-pip.bst
diff --git a/elements/sdk-deps/python-typogrify.bst b/elements/sdk-deps/python-typogrify.bst
index be3a2e600..e0c37b31b 100644
--- a/elements/sdk-deps/python-typogrify.bst
+++ b/elements/sdk-deps/python-typogrify.bst
@@ -9,4 +9,4 @@ build-depends:
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz
diff --git a/elements/sdk-deps/sassc.bst b/elements/sdk-deps/sassc.bst
index 46e768abd..d1b7280df 100644
--- a/elements/sdk-deps/sassc.bst
+++ b/elements/sdk-deps/sassc.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:sass/sassc/archive/refs/tags/3.6.1.tar.gz
+  url: tar_github_com:sass/sassc/archive/refs/tags/3.6.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/xdg-dbus-proxy.bst b/elements/sdk-deps/xdg-dbus-proxy.bst
index 6638c56c6..f538d0a68 100644
--- a/elements/sdk-deps/xdg-dbus-proxy.bst
+++ b/elements/sdk-deps/xdg-dbus-proxy.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
+  url: tar_github_com:flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk/adobe-source-code-pro-fonts.bst b/elements/sdk/adobe-source-code-pro-fonts.bst
index 329900094..f5fc2d910 100644
--- a/elements/sdk/adobe-source-code-pro-fonts.bst
+++ b/elements/sdk/adobe-source-code-pro-fonts.bst
@@ -17,7 +17,7 @@ config:
 
 sources:
 - kind: tar
-  url: github_com:adobe-fonts/source-code-pro/archive/2.010R-ro/1.030R-it.tar.gz
+  url: tar_github_com:adobe-fonts/source-code-pro/archive/2.010R-ro/1.030R-it.tar.gz
 - kind: local
   path: files/font-conf/adobe-source-code-pro.conf
   directory: config
diff --git a/elements/sdk/cantarell-fonts.bst b/elements/sdk/cantarell-fonts.bst
index df559d20e..ce1737f6f 100644
--- a/elements/sdk/cantarell-fonts.bst
+++ b/elements/sdk/cantarell-fonts.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: gnome_downloads:cantarell-fonts/0.301/cantarell-fonts-0.301.tar.xz
+  url: tar_download_gnome_org:sources/cantarell-fonts/0.301/cantarell-fonts-0.301.tar.xz
 build-depends:
 - sdk/appstream-glib.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/sdk/enchant-2.bst b/elements/sdk/enchant-2.bst
index 9bc37ae81..365498a27 100644
--- a/elements/sdk/enchant-2.bst
+++ b/elements/sdk/enchant-2.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz
+  url: tar_github_com:AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/sdk/fcitx.bst b/elements/sdk/fcitx.bst
index e00be2895..1d3d33c05 100644
--- a/elements/sdk/fcitx.bst
+++ b/elements/sdk/fcitx.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:fcitx/fcitx5-gtk/archive/5.0.10.tar.gz
+  url: tar_github_com:fcitx/fcitx5-gtk/archive/5.0.10.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/extra-cmake-modules.bst
diff --git a/elements/sdk/geoclue.bst b/elements/sdk/geoclue.bst
index cd978156e..401547d0d 100644
--- a/elements/sdk/geoclue.bst
+++ b/elements/sdk/geoclue.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.gz
+  url: tar_gitlab_freedesktop_org:geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/krb5.bst b/elements/sdk/krb5.bst
index 816cae87a..38d555924 100644
--- a/elements/sdk/krb5.bst
+++ b/elements/sdk/krb5.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://kerberos.org/dist/krb5/1.19/krb5-1.19.2.tar.gz
+  url: tar_kerberos_org:dist/krb5/1.19/krb5-1.19.2.tar.gz
 - kind: local
   path: files/krb5
   directory: krb5-config
diff --git a/elements/sdk/libwpe.bst b/elements/sdk/libwpe.bst
index fddaed0da..6a50c7b0a 100644
--- a/elements/sdk/libwpe.bst
+++ b/elements/sdk/libwpe.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: https://wpewebkit.org/releases/libwpe-1.12.0.tar.xz
+  url: tar_wpewebkit_org:releases/libwpe-1.12.0.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 
diff --git a/elements/sdk/pinentry.bst b/elements/sdk/pinentry.bst
index b7029ad1b..42ae112c0 100644
--- a/elements/sdk/pinentry.bst
+++ b/elements/sdk/pinentry.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.2.0.tar.bz2
+  url: tar_www_gnupg_org:ftp/gcrypt/pinentry/pinentry-1.2.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk/vala-tarball.bst b/elements/sdk/vala-tarball.bst
index 5ce8cfb4f..685b5b874 100644
--- a/elements/sdk/vala-tarball.bst
+++ b/elements/sdk/vala-tarball.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: gnome_downloads:vala/0.36/vala-0.36.20.tar.xz
+  url: tar_download_gnome_org:sources/vala/0.36/vala-0.36.20.tar.xz
 build-depends:
 - freedesktop-sdk.bst:components/bison.bst
 - freedesktop-sdk.bst:components/flex.bst
diff --git a/elements/sdk/webkitgtk.inc b/elements/sdk/webkitgtk.inc
index 42507caaf..65da7a3cc 100644
--- a/elements/sdk/webkitgtk.inc
+++ b/elements/sdk/webkitgtk.inc
@@ -1,7 +1,7 @@
 sources:
 - kind: tar
   #FIXME: re-enable gtk-doc for webkit2gtk-5.0.bst when fixed upstream
-  url: webkitgtk_org:webkitgtk-2.35.1.tar.xz
+  url: tar_webkitgtk_org:releases/webkitgtk-2.35.1.tar.xz
 - kind: local
   path: files/webkitgtk/toolchain.i686
 - kind: local
diff --git a/elements/sdk/woff2.bst b/elements/sdk/woff2.bst
index 85b36ced6..0811c4172 100644
--- a/elements/sdk/woff2.bst
+++ b/elements/sdk/woff2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:google/woff2/archive/v1.0.2.tar.gz
+  url: tar_github_com:google/woff2/archive/v1.0.2.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/sdk/wpebackend-fdo.bst b/elements/sdk/wpebackend-fdo.bst
index 32e7d7e6f..5bd90bc47 100644
--- a/elements/sdk/wpebackend-fdo.bst
+++ b/elements/sdk/wpebackend-fdo.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://wpewebkit.org/releases/wpebackend-fdo-1.12.0.tar.xz
+  url: tar_wpewebkit_org:releases/wpebackend-fdo-1.12.0.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
diff --git a/elements/vm/NetworkManager-fortisslvpn.bst b/elements/vm/NetworkManager-fortisslvpn.bst
index 22f184cf2..c46121b8f 100644
--- a/elements/vm/NetworkManager-fortisslvpn.bst
+++ b/elements/vm/NetworkManager-fortisslvpn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gnome_downloads:NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.8.tar.xz
+  url: tar_download_gnome_org:sources/NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.8.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/NetworkManager-openconnect.bst b/elements/vm/NetworkManager-openconnect.bst
index cf8e95d7e..75191f7c7 100644
--- a/elements/vm/NetworkManager-openconnect.bst
+++ b/elements/vm/NetworkManager-openconnect.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gnome_downloads:NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.6.tar.xz
+  url: tar_download_gnome_org:sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.6.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/NetworkManager-openvpn.bst b/elements/vm/NetworkManager-openvpn.bst
index 1eb0c9da7..caa21e99e 100644
--- a/elements/vm/NetworkManager-openvpn.bst
+++ b/elements/vm/NetworkManager-openvpn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gnome_downloads:NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.tar.xz
+  url: tar_download_gnome_org:sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/NetworkManager-vpnc.bst b/elements/vm/NetworkManager-vpnc.bst
index c7dddd056..53d1843a4 100644
--- a/elements/vm/NetworkManager-vpnc.bst
+++ b/elements/vm/NetworkManager-vpnc.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gnome_downloads:NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz
+  url: tar_download_gnome_org:sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz
 
 variables:
   conf-local: >-
diff --git a/elements/vm/android-udev-rules.bst b/elements/vm/android-udev-rules.bst
index 84992415c..f9dd7eed5 100644
--- a/elements/vm/android-udev-rules.bst
+++ b/elements/vm/android-udev-rules.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: github_com:M0Rf30/android-udev-rules/archive/20210425.tar.gz
+  url: tar_github_com:M0Rf30/android-udev-rules/archive/20210425.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/pkg-config.bst
diff --git a/elements/vm/anthy.bst b/elements/vm/anthy.bst
index a57e74c35..4501bb2e5 100644
--- a/elements/vm/anthy.bst
+++ b/elements/vm/anthy.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://http.debian.net/debian/pool/main/a/anthy/anthy_0.3.orig.tar.gz
+  url: tar_http_debian_net:debian/pool/main/a/anthy/anthy_0.3.orig.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/buildstream/arpy.bst b/elements/vm/buildstream/arpy.bst
index 09abae3dd..626dba0ba 100644
--- a/elements/vm/buildstream/arpy.bst
+++ b/elements/vm/buildstream/arpy.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/b4/2d/9a1fb66d3632a4646f52cf4d75cda1f14bf6fb74f1bf322236de347523e8/arpy-2.2.0.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/b4/2d/9a1fb66d3632a4646f52cf4d75cda1f14bf6fb74f1bf322236de347523e8/arpy-2.2.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/breezy.bst b/elements/vm/buildstream/breezy.bst
index 4862c42f6..4deef4e70 100644
--- a/elements/vm/buildstream/breezy.bst
+++ b/elements/vm/buildstream/breezy.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: https://launchpad.net/brz/3.1/3.1.0/+download/breezy-3.1.0.tar.gz
+  url: tar_launchpad_net:brz/3.1/3.1.0/+download/breezy-3.1.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/bst-external.bst b/elements/vm/buildstream/bst-external.bst
index 2b7a5f179..a39e1b2e3 100644
--- a/elements/vm/buildstream/bst-external.bst
+++ b/elements/vm/buildstream/bst-external.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: git_tag
-  url: https://gitlab.com/BuildStream/bst-external.git
+  url: gitlab_com:BuildStream/bst-external.git
   track: 0.25.0
 
 build-depends:
diff --git a/elements/vm/buildstream/buildstream.bst b/elements/vm/buildstream/buildstream.bst
index c52f8e904..0eb360ec8 100644
--- a/elements/vm/buildstream/buildstream.bst
+++ b/elements/vm/buildstream/buildstream.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: https://github.com/apache/buildstream/archive/refs/tags/1.6.3.tar.gz
+  url: tar_github_com:apache/buildstream/archive/refs/tags/1.6.3.tar.gz
 
 depends:
 - sdk-deps/bubblewrap.bst
diff --git a/elements/vm/buildstream/click.bst b/elements/vm/buildstream/click.bst
index 1df2ddd1a..c8324e1fb 100644
--- a/elements/vm/buildstream/click.bst
+++ b/elements/vm/buildstream/click.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/27/6f/be940c8b1f1d69daceeb0032fee6c34d7bd70e3e649ccac0951500b4720e/click-7.1.2.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/27/6f/be940c8b1f1d69daceeb0032fee6c34d7bd70e3e649ccac0951500b4720e/click-7.1.2.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/grpcio.bst b/elements/vm/buildstream/grpcio.bst
index 7b0ab249f..aeb13e65c 100644
--- a/elements/vm/buildstream/grpcio.bst
+++ b/elements/vm/buildstream/grpcio.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/a0/d6/d04c6550debe23e2eaef0d9c4adccbb6e20d8cce6da40ae989fe8836e287/grpcio-1.37.1.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/a0/d6/d04c6550debe23e2eaef0d9c4adccbb6e20d8cce6da40ae989fe8836e287/grpcio-1.37.1.tar.gz
 
 depends:
 - freedesktop-sdk.bst:components/python3.bst
diff --git a/elements/vm/buildstream/pluginbase.bst b/elements/vm/buildstream/pluginbase.bst
index 487509430..eaf6d828b 100644
--- a/elements/vm/buildstream/pluginbase.bst
+++ b/elements/vm/buildstream/pluginbase.bst
@@ -6,4 +6,4 @@ depends:
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/3d/3c/fe974b4f835f83cc46966e04051f8708b7535bac28fbc0dcca1ee0c237b8/pluginbase-1.0.0.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/3d/3c/fe974b4f835f83cc46966e04051f8708b7535bac28fbc0dcca1ee0c237b8/pluginbase-1.0.0.tar.gz
diff --git a/elements/vm/buildstream/psutil.bst b/elements/vm/buildstream/psutil.bst
index 07b615229..618cc4559 100644
--- a/elements/vm/buildstream/psutil.bst
+++ b/elements/vm/buildstream/psutil.bst
@@ -8,4 +8,4 @@ depends:
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7/psutil-5.8.0.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7/psutil-5.8.0.tar.gz
diff --git a/elements/vm/buildstream/pytest-runner.bst b/elements/vm/buildstream/pytest-runner.bst
index e94952cbe..c478214f0 100644
--- a/elements/vm/buildstream/pytest-runner.bst
+++ b/elements/vm/buildstream/pytest-runner.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/62/6d/681466a726a851faf4a175d0d73675cc19470a31be414e7f46fc776027e5/pytest-runner-5.3.0.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/62/6d/681466a726a851faf4a175d0d73675cc19470a31be414e7f46fc776027e5/pytest-runner-5.3.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-wheel.bst
diff --git a/elements/vm/buildstream/python3-configobj.bst b/elements/vm/buildstream/python3-configobj.bst
index 3a6af69fc..3f7e937a6 100644
--- a/elements/vm/buildstream/python3-configobj.bst
+++ b/elements/vm/buildstream/python3-configobj.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab/configobj-5.0.6.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/python3-dulwich.bst b/elements/vm/buildstream/python3-dulwich.bst
index dcc1b4aad..27c6834bc 100644
--- a/elements/vm/buildstream/python3-dulwich.bst
+++ b/elements/vm/buildstream/python3-dulwich.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/31/02/791c17b92e6d04c43f9b318c95a3f3c3e1ea718aa72ad95b9dac147895fa/dulwich-0.20.21.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/31/02/791c17b92e6d04c43f9b318c95a3f3c3e1ea718aa72ad95b9dac147895fa/dulwich-0.20.21.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/python3-fastimport.bst b/elements/vm/buildstream/python3-fastimport.bst
index 2374d4bbd..eff488ed4 100644
--- a/elements/vm/buildstream/python3-fastimport.bst
+++ b/elements/vm/buildstream/python3-fastimport.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/4b/cf/487330428bed5e21915835096831cfe5fd30d2e68383c33d058a729f8ea3/fastimport-0.9.11.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/4b/cf/487330428bed5e21915835096831cfe5fd30d2e68383c33d058a729f8ea3/fastimport-0.9.11.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/python3-markupsafe.bst b/elements/vm/buildstream/python3-markupsafe.bst
index c0ae63251..7553aa5d5 100644
--- a/elements/vm/buildstream/python3-markupsafe.bst
+++ b/elements/vm/buildstream/python3-markupsafe.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/vm/buildstream/ruamel-yaml-clib.bst b/elements/vm/buildstream/ruamel-yaml-clib.bst
index 45be525cd..524cc1937 100644
--- a/elements/vm/buildstream/ruamel-yaml-clib.bst
+++ b/elements/vm/buildstream/ruamel-yaml-clib.bst
@@ -2,7 +2,7 @@ kind: pip
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/fa/a1/f9c009a633fce3609e314294c7963abe64934d972abea257dce16a15666f/ruamel.yaml.clib-0.2.2.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/fa/a1/f9c009a633fce3609e314294c7963abe64934d972abea257dce16a15666f/ruamel.yaml.clib-0.2.2.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-pip.bst
diff --git a/elements/vm/buildstream/ruamel-yaml.bst b/elements/vm/buildstream/ruamel-yaml.bst
index 4fddbe518..0becef1c6 100644
--- a/elements/vm/buildstream/ruamel-yaml.bst
+++ b/elements/vm/buildstream/ruamel-yaml.bst
@@ -2,7 +2,7 @@ kind: pip
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/62/cf/148028462ab88a71046ba0a30780357ae9e07125863ea9ca7808f1ea3798/ruamel.yaml-0.17.4.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/62/cf/148028462ab88a71046ba0a30780357ae9e07125863ea9ca7808f1ea3798/ruamel.yaml-0.17.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-pip.bst
diff --git a/elements/vm/buildstream/ujson.bst b/elements/vm/buildstream/ujson.bst
index d191d91ef..c6b4fd379 100644
--- a/elements/vm/buildstream/ujson.bst
+++ b/elements/vm/buildstream/ujson.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: 
https://files.pythonhosted.org/packages/86/0a/80d87aa4ee79980bddabef13cb7d95de330f85355cf08dfdaf874889b02b/ujson-4.0.2.tar.gz
+  url: 
tar_files_pythonhosted_org:packages/86/0a/80d87aa4ee79980bddabef13cb7d95de330f85355cf08dfdaf874889b02b/ujson-4.0.2.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools-scm.bst
diff --git a/elements/vm/eos-repartition.bst b/elements/vm/eos-repartition.bst
index 0ff1877b8..478c39097 100644
--- a/elements/vm/eos-repartition.bst
+++ b/elements/vm/eos-repartition.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: github_com:endlessm/eos-boot-helper/archive/Release_3.9.4.tar.gz
+  url: tar_github_com:endlessm/eos-boot-helper/archive/Release_3.9.4.tar.gz
 - kind: patch
   path: files/vm/eos-repartition/fix-sector-size-issue.patch
 
diff --git a/elements/vm/fish.bst b/elements/vm/fish.bst
index f31427f7b..699d0208f 100644
--- a/elements/vm/fish.bst
+++ b/elements/vm/fish.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
+  url: tar_github_com:fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
@@ -23,7 +23,7 @@ public:
 # Do not display the .desktop file in the launcher.
 # The reason it was added was for appimage builds, not cause its a critical part of the software.
 # It doesn't need to be shown in gnome-os.
-# https://github.com/fish-shell/fish-shell/commit/eb7172458b628b81a3f70f38a0e58c7c23202f05
+# tar_github_com:fish-shell/fish-shell/commit/eb7172458b628b81a3f70f38a0e58c7c23202f05
 config:
   install-commands:
     (>):
diff --git a/elements/vm/git-lfs.bst b/elements/vm/git-lfs.bst
index c6e8372f7..a47db32f1 100644
--- a/elements/vm/git-lfs.bst
+++ b/elements/vm/git-lfs.bst
@@ -2,7 +2,7 @@ kind: make
 
 sources:
 - kind: tar
-  url: github_com:git-lfs/git-lfs/releases/download/v2.13.3/git-lfs-v2.13.3.tar.gz
+  url: tar_github_com:git-lfs/git-lfs/releases/download/v2.13.3/git-lfs-v2.13.3.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/go.bst
diff --git a/elements/vm/ibus-anthy.bst b/elements/vm/ibus-anthy.bst
index 938c43ede..a7c1f0999 100644
--- a/elements/vm/ibus-anthy.bst
+++ b/elements/vm/ibus-anthy.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:ibus/ibus-anthy/releases/download/1.5.12/ibus-anthy-1.5.12.tar.gz
+  url: tar_github_com:ibus/ibus-anthy/releases/download/1.5.12/ibus-anthy-1.5.12.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/vm/ibus-hangul.bst b/elements/vm/ibus-hangul.bst
index fe8487d45..b3cb554db 100644
--- a/elements/vm/ibus-hangul.bst
+++ b/elements/vm/ibus-hangul.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
+  url: tar_github_com:libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/ibus-libpinyin.bst b/elements/vm/ibus-libpinyin.bst
index f794b2bad..2969bc41c 100644
--- a/elements/vm/ibus-libpinyin.bst
+++ b/elements/vm/ibus-libpinyin.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:libpinyin/ibus-libpinyin/releases/download/1.12.1/ibus-libpinyin-1.12.1.tar.gz
+  url: tar_github_com:libpinyin/ibus-libpinyin/releases/download/1.12.1/ibus-libpinyin-1.12.1.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/kyotocabinet.bst b/elements/vm/kyotocabinet.bst
index 2d15dbf79..e77e9ecb3 100644
--- a/elements/vm/kyotocabinet.bst
+++ b/elements/vm/kyotocabinet.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
+  url: tar_fallabs_com:kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
 - kind: patch
   path: files/kyotocabinet/cpp-14.patch
 build-depends:
diff --git a/elements/vm/libhangul.bst b/elements/vm/libhangul.bst
index 806fe28ac..4ffa5a517 100644
--- a/elements/vm/libhangul.bst
+++ b/elements/vm/libhangul.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: http://kldp.net/hangul/release/3442-libhangul-0.1.0.tar.gz
+  url: tar_kldp_net:hangul/release/3442-libhangul-0.1.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/libpinyin.bst b/elements/vm/libpinyin.bst
index 32f71d30b..a1a092413 100644
--- a/elements/vm/libpinyin.bst
+++ b/elements/vm/libpinyin.bst
@@ -1,9 +1,9 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:libpinyin/libpinyin/releases/download/2.6.1/libpinyin-2.6.1.tar.gz
+  url: tar_github_com:libpinyin/libpinyin/releases/download/2.6.1/libpinyin-2.6.1.tar.gz
 - kind: tar
-  url: downloads.sourceforge.net:libpinyin/models/model17.text.tar.gz
+  url: tar_downloads_sourceforge_net:libpinyin/models/model17.text.tar.gz
   base-dir: ''
   directory: data
 build-depends:
diff --git a/elements/vm/lxc.bst b/elements/vm/lxc.bst
index fd7e42727..6a8b82658 100644
--- a/elements/vm/lxc.bst
+++ b/elements/vm/lxc.bst
@@ -27,4 +27,4 @@ public:
 
 sources:
 - kind: tar
-  url: https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz
+  url: tar_linuxcontainers_org:downloads/lxc/lxc-4.0.10.tar.gz
diff --git a/elements/vm/nss-mdns.bst b/elements/vm/nss-mdns.bst
index 9f63b6c7b..6c7acc539 100644
--- a/elements/vm/nss-mdns.bst
+++ b/elements/vm/nss-mdns.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz
+  url: tar_github_com:lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz
 
 runtime-depends:
 - freedesktop-sdk.bst:components/avahi.bst
diff --git a/elements/vm/ntfs-3g.bst b/elements/vm/ntfs-3g.bst
index 49a031d97..e9fbce025 100644
--- a/elements/vm/ntfs-3g.bst
+++ b/elements/vm/ntfs-3g.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gnome_download:teams/releng/tarballs-needing-help/ntfs-3g/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
+  url: 
https://download.gnome.org/teams/releng/tarballs-needing-help/ntfs-3g/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/vm/openconnect.bst b/elements/vm/openconnect.bst
index bf9cc8c81..96d76a400 100644
--- a/elements/vm/openconnect.bst
+++ b/elements/vm/openconnect.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz
+  url: tar_ftp_infradead_org:pub/openconnect/openconnect-8.10.tar.gz
 
 variables:
   conf-local: >-
diff --git a/elements/vm/openfortivpn.bst b/elements/vm/openfortivpn.bst
index 74ad133a1..a72202290 100644
--- a/elements/vm/openfortivpn.bst
+++ b/elements/vm/openfortivpn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:adrienverge/openfortivpn/archive/refs/tags/v1.16.0.tar.gz
+  url: tar_github_com:adrienverge/openfortivpn/archive/refs/tags/v1.16.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/opensc.bst b/elements/vm/opensc.bst
index bd8c07583..d6762b593 100644
--- a/elements/vm/opensc.bst
+++ b/elements/vm/opensc.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
+  url: tar_github_com:OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/openvpn.bst b/elements/vm/openvpn.bst
index fa1e2c3d4..d2c7fbdeb 100644
--- a/elements/vm/openvpn.bst
+++ b/elements/vm/openvpn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://swupdate.openvpn.org/community/releases/openvpn-2.5.1.tar.gz
+  url: tar_swupdate_openvpn_org:community/releases/openvpn-2.5.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/qemu-tools.bst b/elements/vm/qemu-tools.bst
index e9a8f067c..8fc84b933 100644
--- a/elements/vm/qemu-tools.bst
+++ b/elements/vm/qemu-tools.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://download.qemu.org/qemu-5.2.0.tar.xz
+  url: tar_download_qemu_org:qemu-5.2.0.tar.xz
 
 depends:
 - sdk/glib.bst
diff --git a/elements/vm/spice-vdagent.bst b/elements/vm/spice-vdagent.bst
index 6010f45c6..43d062052 100644
--- a/elements/vm/spice-vdagent.bst
+++ b/elements/vm/spice-vdagent.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: spice:releases/spice-vdagent-0.21.0.tar.bz2
+  url: tar_www_spice-space_org:download/releases/spice-vdagent-0.21.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/toolbox.bst b/elements/vm/toolbox.bst
index 8f8ba0572..8b7608cf1 100644
--- a/elements/vm/toolbox.bst
+++ b/elements/vm/toolbox.bst
@@ -2,84 +2,84 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://github.com/containers/toolbox/releases/download/0.0.99.1/toolbox-0.0.99.1.tar.xz
+  url: tar_github_com:containers/toolbox/releases/download/0.0.99.1/toolbox-0.0.99.1.tar.xz
 - kind: git_tag
-  url: https://github.com/HarryMichal/go-version.git
+  url: github_com:HarryMichal/go-version.git
   track: v1.0.0
   track-tags: false
   directory: 'src/vendor/github.com/HarryMichal/go-version'
 - kind: git_tag
-  url: https://github.com/acobaugh/osrelease.git
+  url: github_com:acobaugh/osrelease.git
   track: a93a0a55a249
   track-tags: false
   directory: 'src/vendor/github.com/acobaugh/osrelease'
 - kind: git_tag
-  url: https://github.com/briandowns/spinner.git
+  url: github_com:briandowns/spinner.git
   track: v1.10.0
   track-tags: false
   directory: 'src/vendor/github.com/briandowns/spinner'
 - kind: git_tag
-  url: https://github.com/docker/go-units.git
+  url: github_com:docker/go-units.git
   track: v0.4.0
   track-tags: false
   directory: 'src/vendor/github.com/docker/go-units'
 - kind: git_tag
-  url: https://github.com/fsnotify/fsnotify.git
+  url: github_com:fsnotify/fsnotify.git
   track: v1.4.7
   track-tags: false
   directory: 'src/vendor/github.com/fsnotify/fsnotify'
 - kind: git_tag
-  url: https://github.com/fatih/color.git
+  url: github_com:fatih/color.git
   track: v1.7.0
   track-tags: false
   directory: 'src/vendor/github.com/fatih/color'
 - kind: git_tag
-  url: https://github.com/godbus/dbus.git
+  url: github_com:godbus/dbus.git
   track: v5.0.3
   track-tags: false
   directory: 'src/vendor/github.com/godbus/dbus/v5'
 - kind: git_tag
-  url: https://github.com/inconshreveable/mousetrap.git
+  url: github_com:inconshreveable/mousetrap.git
   track: v1.0.0
   track-tags: false
   directory: 'src/vendor/github.com/inconshreveable/mousetrap'
 - kind: git_tag
-  url: https://github.com/konsorten/go-windows-terminal-sequences.git
+  url: github_com:konsorten/go-windows-terminal-sequences.git
   track: v1.0.1
   track-tags: false
   directory: 'src/vendor/github.com/konsorten/go-windows-terminal-sequences'
 - kind: git_tag
-  url: https://github.com/mattn/go-colorable.git
+  url: github_com:mattn/go-colorable.git
   track: v0.1.2
   track-tags: false
   directory: 'src/vendor/github.com/mattn/go-colorable'
 - kind: git_tag
-  url: https://github.com/mattn/go-isatty.git
+  url: github_com:mattn/go-isatty.git
   track: v0.0.8
   track-tags: false
   directory: 'src/vendor/github.com/mattn/go-isatty'
 - kind: git_tag
-  url: https://github.com/sirupsen/logrus.git
+  url: github_com:sirupsen/logrus.git
   track: v1.4.2
   track-tags: false
   directory: 'src/vendor/github.com/sirupsen/logrus'
 - kind: git_tag
-  url: https://github.com/spf13/cobra.git
+  url: github_com:spf13/cobra.git
   track: v0.0.5
   track-tags: false
   directory: 'src/vendor/github.com/spf13/cobra'
 - kind: git_tag
-  url: https://github.com/spf13/pflag.git
+  url: github_com:spf13/pflag.git
   track: v1.0.3
   track-tags: false
   directory: 'src/vendor/github.com/spf13/pflag'
 - kind: git_tag
-  url: https://github.com/golang/crypto.git
+  url: github_com:golang/crypto.git
   track: 505ab145d0a9
   track-tags: false
   directory: 'src/vendor/golang.org/x/crypto'
 - kind: git_tag
-  url: https://github.com/golang/sys.git
+  url: github_com:golang/sys.git
   track: 66c3f260301c
   track-tags: false
   directory: 'src/vendor/golang.org/x/sys'
diff --git a/elements/vm/uresourced.bst b/elements/vm/uresourced.bst
index 3728bba99..e565ab885 100644
--- a/elements/vm/uresourced.bst
+++ b/elements/vm/uresourced.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://gitlab.freedesktop.org/benzea/uresourced/-/archive/v0.4.0/uresourced-v0.4.0.tar.bz2
+  url: tar_gitlab_freedesktop_org:benzea/uresourced/-/archive/v0.4.0/uresourced-v0.4.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/vm/vpnc-scripts.bst b/elements/vm/vpnc-scripts.bst
index d0107ad3c..d74b97c03 100644
--- a/elements/vm/vpnc-scripts.bst
+++ b/elements/vm/vpnc-scripts.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20210402.tar.gz
+  url: tar_ftp_infradead_org:pub/vpnc-scripts/vpnc-scripts-20210402.tar.gz
 
 config:
   install-commands:
diff --git a/elements/world/cairomm.bst b/elements/world/cairomm.bst
index 5bade72b5..7288fd01d 100644
--- a/elements/world/cairomm.bst
+++ b/elements/world/cairomm.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: cairo_org:releases/cairomm-1.16.0.tar.xz
+  url: tar_cairographics_org:releases/cairomm-1.16.0.tar.xz
 
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/world/dbus-glib.bst b/elements/world/dbus-glib.bst
index 7c0ea79ea..027eec4bd 100644
--- a/elements/world/dbus-glib.bst
+++ b/elements/world/dbus-glib.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
+  url: tar_dbus_freedesktop_org:releases/dbus-glib/dbus-glib-0.110.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/world/libhandy-0.bst b/elements/world/libhandy-0.bst
index e44ff65c0..ce3f8dbfb 100644
--- a/elements/world/libhandy-0.bst
+++ b/elements/world/libhandy-0.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: https://source.puri.sm/Librem5/libhandy/-/archive/v0.0.13/libhandy-v0.0.13.tar.bz2
+  url: tar_source_puri_sm:Librem5/libhandy/-/archive/v0.0.13/libhandy-v0.0.13.tar.bz2
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/world/qqwing.bst b/elements/world/qqwing.bst
index c5f3dd9ae..367584492 100644
--- a/elements/world/qqwing.bst
+++ b/elements/world/qqwing.bst
@@ -1,6 +1,6 @@
 kind: autotools
 sources:
 - kind: tar
-  url: qqwing:qqwing-1.3.4.tar.gz
+  url: tar_qqwing_com:qqwing-1.3.4.tar.gz
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/wlroots.bst b/elements/world/wlroots.bst
index 308a4d100..9bd1e8353 100644
--- a/elements/world/wlroots.bst
+++ b/elements/world/wlroots.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: https://source.puri.sm/Librem5/wlroots.git
+  url: source_puri_sm:Librem5/wlroots.git
   track: librem5-0.12.x
 
 build-depends:
diff --git a/include/aliases.yml b/include/aliases.yml
new file mode 100644
index 000000000..a6b41930a
--- /dev/null
+++ b/include/aliases.yml
@@ -0,0 +1,101 @@
+# Source aliases.
+#
+# These are used in the individual element.bst files in
+# place of specifying full uris.
+# 
+# The location from where source code is downloaded can
+# be changed without triggering a rebuild.
+#
+gnome_downloads: https://download.gnome.org/sources/
+cairo_org: https://cairographics.org/
+cdn_kernel_org: https://cdn.kernel.org/pub/
+downloads.sourceforge.net: https://downloads.sourceforge.net/
+ftp_gnu_org: https://ftp.gnu.org/gnu/
+git_code_sf_net: https://git.code.sf.net/
+git_freedesktop_org: https://gitlab.freedesktop.org/
+github_com: https://github.com/
+gitlab_com: https://gitlab.com/
+gitlab_gnome_org: https://gitlab.gnome.org/
+gnome_download: https://download.gnome.org/
+gstreamer: https://gstreamer.freedesktop.org/src/
+icon_theme_freedesktop_org: https://icon-theme.freedesktop.org/releases/
+iso_codes: https://pkg-isocodes.alioth.debian.org/downloads/
+libburnia: http://files.libburnia-project.org/releases/
+people_freedesktop_org: https://people.freedesktop.org/
+purism: https://source.puri.sm/
+qqwing: https://qqwing.com/
+sourceforge_net: https://sourceforge.net/projects/
+spice: https://www.spice-space.org/download/
+tarballs_needing_help: https://people.gnome.org/~mcatanzaro/tarballs-needing-help/
+webkitgtk_org: https://webkitgtk.org/releases/
+#
+# Aliases associated with .git files
+#
+# Repeated aliases have been commented out
+#
+#  git_code_sf_net: https://git.code.sf.net/
+git_eno_space: https://git.eno.space/
+#  github_com: https://github.com/
+#  gitlab_com: https://gitlab.com/
+#  gitlab_gnome_org: https://gitlab.gnome.org/
+gitlab_manjaro_org: https://gitlab.manjaro.org/
+source_puri_sm: https://source.puri.sm/
+#
+# Aliases associated with .tar files
+#
+tar_boostorg_jfrog_io: https://boostorg.jfrog.io/
+tar_cairographics_org: https://cairographics.org/
+tar_cpan_metacpan_org: https://cpan.metacpan.org/
+tar_cyberelk_net: http://cyberelk.net/
+tar_dbus_freedesktop_org: https://dbus.freedesktop.org/
+tar_download_gimp_org: https://download.gimp.org/
+tar_download_gnome_org: https://download.gnome.org/
+tar_download_qemu_org: https://download.qemu.org/
+tar_download_samba_org: https://download.samba.org/
+tar_download_videolan_org: http://download.videolan.org/
+tar_downloads_sourceforge_net: https://downloads.sourceforge.net/
+tar_fallabs_com: http://fallabs.com/
+tar_files_libburnia-project_org: http://files.libburnia-project.org/
+tar_files_pythonhosted_org: https://files.pythonhosted.org/
+tar_ftp_denx_de: ftp://ftp.denx.de/
+tar_ftp_gnu_org: https://ftp.gnu.org/
+tar_ftp_infradead_org: ftp://ftp.infradead.org/
+tar_ftp_netfilter_org: http://ftp.netfilter.org/
+tar_ftp_videolan_org: http://ftp.videolan.org/
+tar_git_kernel_org: https://git.kernel.org/
+tar_github_com: https://github.com/
+tar_gitlab_com: https://gitlab.com/
+tar_gitlab_freedesktop_org: https://gitlab.freedesktop.org/
+tar_gstreamer_freedesktop_org: https://gstreamer.freedesktop.org/
+tar_http_debian_net: http://http.debian.net/
+tar_kerberos_org: https://kerberos.org/
+tar_kldp_net: http://kldp.net/
+tar_launchpad_net: https://launchpad.net/
+tar_libopenraw_freedesktop_org: https://libopenraw.freedesktop.org/
+tar_libvirt_org: https://libvirt.org/
+tar_linuxcontainers_org: https://linuxcontainers.org/
+tar_notroj_github_io: https://notroj.github.io/
+tar_people_freedesktop_org: https://people.freedesktop.org/
+tar_people_gnome_org: https://people.gnome.org/
+tar_people_redhat_com: https://people.redhat.com/
+tar_pub_freerdp_com: https://pub.freerdp.com/
+tar_qqwing_com: https://qqwing.com/
+tar_releases_pagure_org: https://releases.pagure.org/
+tar_sites_google_com: https://sites.google.com/
+tar_source_puri_sm: https://source.puri.sm/
+tar_static_crates_io: https://static.crates.io/
+tar_swupdate_openvpn_org: https://swupdate.openvpn.org/
+tar_tecnocode_co_uk: https://tecnocode.co.uk/
+tar_webkitgtk_org: https://webkitgtk.org/
+tar_wpewebkit_org: https://wpewebkit.org/
+tar_www_freedesktop_org: https://www.freedesktop.org/
+tar_www_gnupg_org: https://www.gnupg.org/
+tar_www_libraw_org: https://www.libraw.org/
+tar_www_openldap_org: https://www.openldap.org/
+tar_www_spice-space_org: https://www.spice-space.org/
+tar_www_tcpdump_org: https://www.tcpdump.org/
+tar_www_thekelleys_org_uk: http://www.thekelleys.org.uk/
+#
+# Additional troublesome mirrors
+#
+git_code_sf_net_p_gtspell: https://source.puri.sm/p/gtkspell/
diff --git a/include/mirrors.yml b/include/mirrors.yml
new file mode 100644
index 000000000..e942023f2
--- /dev/null
+++ b/include/mirrors.yml
@@ -0,0 +1,120 @@
+git_code_sf_net:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/git_code_sf_net/
+git_code_sf_net_p_gtkspell:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/git_code_sf_net/p/gtkspell/
+git_eno_space:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/git_eno_space/
+github_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/github_com/
+gitlab_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_com/
+gitlab_gnome_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_gnome_org/
+gitlab_manjaro_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_manjaro_org/
+source_puri_sm:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/source_puri_sm/
+tar_boostorg_jfrog_io:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/boostorg_jfrog_io/-/blob/master/
+tar_cairographics_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/cairographics_org/-/blob/master/
+tar_cpan_metacpan_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/cpan_metacpan_org/-/blob/master/
+tar_cyberelk_net:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/cyberelk_net/-/blob/master/
+tar_dbus_freedesktop_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/dbus_freedesktop_org/-/blob/master/
+tar_download_gimp_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/download_gimp_org/-/blob/master/
+tar_download_gnome_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/download_gnome_org/-/blob/master/
+tar_download_qemu_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/download_qemu_org/-/blob/master/
+tar_download_samba_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/download_samba_org/-/blob/master/
+tar_download_videolan_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/download_videolan_org/-/blob/master/
+tar_downloads_sourceforge_net:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/downloads_sourceforge_net/-/blob/master/
+tar_fallabs_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/fallabs_com/-/blob/master/
+tar_files_libburnia-project_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/files_libburnia-project_org/-/blob/master/
+tar_files_pythonhosted_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/files_pythonhosted_org/-/blob/master/
+tar_ftp_denx_de:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/ftp_denx_de/-/blob/master/
+tar_ftp_gnu_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/ftp_gnu_org/-/blob/master/
+tar_ftp_infradead_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/ftp_infradead_org/-/blob/master/
+tar_ftp_netfilter_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/ftp_netfilter_org/-/blob/master/
+tar_ftp_videolan_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/ftp_videolan_org/-/blob/master/
+tar_git_kernel_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/git_kernel_org/-/blob/master/
+tar_github_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/github_com/-/blob/master/
+tar_gitlab_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_com/-/blob/master/
+tar_gitlab_freedesktop_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_freedesktop_org/-/blob/master/
+tar_gstreamer_freedesktop_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gstreamer_freedesktop_org/-/blob/master/
+tar_http_debian_net:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/http_debian_net/-/blob/master/
+tar_kerberos_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/kerberos_org/-/blob/master/
+tar_kldp_net:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/kldp_net/-/blob/master/
+tar_launchpad_net:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/launchpad_net/-/blob/master/
+tar_libopenraw_freedesktop_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/libopenraw_freedesktop_org/-/blob/master/
+tar_libvirt_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/libvirt_org/-/blob/master/
+tar_linuxcontainers_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/linuxcontainers_org/-/blob/master/
+tar_notroj_github_io:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/notroj_github_io/-/blob/master/
+tar_people_freedesktop_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/people_freedesktop_org/-/blob/master/
+tar_people_gnome_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/people_gnome_org/-/blob/master/
+tar_people_redhat_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/people_redhat_com/-/blob/master/
+tar_pub_freerdp_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/pub_freerdp_com/-/blob/master/
+tar_qqwing_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/qqwing_com/-/blob/master/
+tar_releases_pagure_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/releases_pagure_org/-/blob/master/
+tar_sites_google_com:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/sites_google_com/-/blob/master/
+tar_source_puri_sm:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/source_puri_sm/-/blob/master/
+tar_static_crates_io:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/static_crates_io/-/blob/master/
+tar_swupdate_openvpn_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/swupdate_openvpn_org/-/blob/master/
+tar_tecnocode_co_uk:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/tecnocode_co_uk/-/blob/master/
+tar_webkitgtk_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/webkitgtk_org/-/blob/master/
+tar_wpewebkit_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/wpewebkit_org/-/blob/master/
+tar_www_freedesktop_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_freedesktop_org/-/blob/master/
+tar_www_gnupg_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_gnupg_org/-/blob/master/
+tar_www_libraw_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_libraw_org/-/blob/master/
+tar_www_openldap_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_openldap_org/-/blob/master/
+tar_www_spice-space_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_spice-space_org/-/blob/master/
+tar_www_tcpdump_org:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_tcpdump_org/-/blob/master/
+tar_www_thekelleys_org_uk:
+- https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/www_thekelleys_org_uk/-/blob/master/
diff --git a/project.conf b/project.conf
index b1c72de1d..0ad7d3c0d 100644
--- a/project.conf
+++ b/project.conf
@@ -41,38 +41,8 @@ options:
     default: false
     description: mount host resources similar to toolbox
 
-
-# Source aliases.
-#
-# These are used in the individual element.bst files in
-# place of specifying full uris.
-# 
-# The location from where source code is downloaded can
-# be changed without triggering a rebuild.
-#
 aliases:
-  gnome_downloads: https://download.gnome.org/sources/
-  cairo_org: https://cairographics.org/
-  cdn_kernel_org: https://cdn.kernel.org/pub/
-  downloads.sourceforge.net: https://downloads.sourceforge.net/
-  ftp_gnu_org: https://ftp.gnu.org/gnu/
-  git_code_sf_net: https://git.code.sf.net/
-  git_freedesktop_org: https://gitlab.freedesktop.org/
-  github_com: https://github.com/
-  gitlab_com: https://gitlab.com/
-  gitlab_gnome_org: https://gitlab.gnome.org/
-  gnome_download: https://download.gnome.org/
-  gstreamer: https://gstreamer.freedesktop.org/src/
-  icon_theme_freedesktop_org: https://icon-theme.freedesktop.org/releases/
-  iso_codes: https://pkg-isocodes.alioth.debian.org/downloads/
-  libburnia: http://files.libburnia-project.org/releases/
-  people_freedesktop_org: https://people.freedesktop.org/
-  purism: https://source.puri.sm/
-  qqwing: https://qqwing.com/
-  sourceforge_net: https://sourceforge.net/projects/
-  spice: https://www.spice-space.org/download/
-  tarballs_needing_help: https://people.gnome.org/~mcatanzaro/tarballs-needing-help/
-  webkitgtk_org: https://webkitgtk.org/releases/
+  (@): include/aliases.yml
 
 mirrors:
 - name: kernel_org
@@ -81,12 +51,7 @@ mirrors:
     - https://mirrors.kernel.org/gnu/
 - name: gnome
   aliases:
-    github_com:
-    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/github_com/
-    gitlab_com:
-    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_com/
-    purism:
-    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/source_puri_sm/
+    (@): include/mirrors.yml
 
 # Some overrides to the default sandbox execution environment
 #


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]