[gnome-build-meta/jjardon/ellisb/add-first-mirror: 12/13] Change the way that files are included

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

commit 947a848fe1c6a265aef68e75f52bf50e30ae084a
Author: Ellis Barnwell <ellis barnwell codethink co uk>
Date:   Fri Dec 3 14:37:33 2021 +0000

    Change the way that files are included
    
    Buildstream has an issue if (@): is used multiple times as it sees it as
    duplicate keys.

 include/aliases.yml | 163 ++++++++++++++++++++++++++--------------------------
 include/mirrors.yml |   1 -
 2 files changed, 81 insertions(+), 83 deletions(-)
---
diff --git a/include/aliases.yml b/include/aliases.yml
index 77b754dcb..a6b41930a 100644
--- a/include/aliases.yml
+++ b/include/aliases.yml
@@ -6,97 +6,96 @@
 # 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/
+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/
+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/
+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/
+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
index 89ce8c39e..d99f93806 100644
--- a/include/mirrors.yml
+++ b/include/mirrors.yml
@@ -1,4 +1,3 @@
-mirrors:
 - name: kernel_org
   aliases:
     ftp_gnu_org: