From ffd49df662741fc4aa2cefc2fd121f86dcc22ce9 Mon Sep 17 00:00:00 2001
From: Alejandro R Mosteo <alejandro@mosteo.com>
Date: Tue, 14 Sep 2021 09:59:47 +0200
Subject: [PATCH 1/3] Backport improvements to build script (#350)

In the stable branch we are still testing the newest release, while sometimes
we get fixes to older release manifests.
---
 scripts/gh-build-crate.sh | 79 ++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/scripts/gh-build-crate.sh b/scripts/gh-build-crate.sh
index 2f3d13b9..458247ca 100755
--- a/scripts/gh-build-crate.sh
+++ b/scripts/gh-build-crate.sh
@@ -43,34 +43,45 @@ for file in $CHANGES; do
    is_system=false
 
    crate=$(basename $file .toml | cut -f1 -d-)
-   echo Testing crate: $crate
+   version=$(basename $file .toml | cut -f2- -d-)
+   milestone="$crate=$version"
+   echo Testing crate: $milestone
+   # Remember that version can be "external", in which case we do not know the
+   # actual version, and indeed the test will only work if the external is the
+   # newest version. This probably merits a way of being tested properly, but
+   # that will require changes in alr.
+
+   if [[ $version = external ]]; then
+      echo Downgrading milestone to plain crate name
+      milestone=$crate
+   fi
 
    # Show info for the record
-   echo PLATFORM-INDEPENDENT CRATE INFO $crate
-   alr show $crate
-   alr show --external $crate
-   alr show --external-detect $crate
+   echo PLATFORM-INDEPENDENT CRATE INFO $milestone
+   alr show $milestone
+   alr show --external $milestone
+   alr show --external-detect $milestone
 
-   echo PLATFORM-DEPENDENT CRATE INFO $crate
-   alr show --system $crate
-   alr show --external --system $crate
-   alr show --external-detect --system $crate
-   crateinfo=$(alr show --external-detect --system $crate)
+   echo PLATFORM-DEPENDENT CRATE INFO $milestone
+   alr show --system $milestone
+   alr show --external --system $milestone
+   alr show --external-detect --system $milestone
+   crateinfo=$(alr show --external-detect --system $milestone)
 
-   echo CRATE DEPENDENCIES $crate
-   alr show --solve --detail --external-detect $crate
-   solution=$(alr show --solve --detail --external-detect $crate)
+   echo CRATE DEPENDENCIES $milestone
+   alr show --solve --detail --external-detect $milestone
+   solution=$(alr show --solve --detail --external-detect $milestone)
 
    # Skip on explicit unavailability
-   if alr show --system $crate | grep -q 'Available when: False'; then
-      echo SKIPPING crate build: $crate UNAVAILABLE on system
+   if alr show --system $milestone | grep -q 'Available when: False'; then
+      echo SKIPPING crate build: $milestone UNAVAILABLE on system
       continue
    fi
 
    # In unsupported platforms, externals are properly reported as missing. We
    # can skip testing of such a crate since it will likely fail.
    if grep -q 'Dependencies (external):' <<< $solution ; then
-      echo SKIPPING build for crate $crate with MISSING external dependencies
+      echo SKIPPING build for crate $milestone with MISSING external dependencies
       continue
    fi
 
@@ -84,13 +95,20 @@ for file in $CHANGES; do
       echo No need to update system repositories
    fi
 
+   # Detect whether the crate is binary to skip build
+   is_binary=false
+   if grep -iq 'binary archive' <<< $crateinfo; then
+      echo Crate is BINARY
+      is_binary=true
+   fi
+
    # Alternatives for when the crate itself comes from an external. Only system
    # externals should be tested.
    if grep -q 'Origin: external path' <<< $crateinfo ; then
-      echo SKIPPING detected external crate $crate
+      echo SKIPPING detected external crate $milestone
       continue
    elif grep -q 'Origin: system package' <<< $crateinfo ; then
-      echo INSTALLING detected system crate $crate
+      echo INSTALLING detected system crate $milestone
       is_system=true
    elif grep -q 'Not found:' <<< $crateinfo && \
         grep -q 'There are external definitions' <<< $crateinfo
@@ -101,23 +119,32 @@ for file in $CHANGES; do
 
    # Detect missing dependencies for clearer error
    if grep -q 'Dependencies cannot be met' <<< $solution ; then
-      echo FAIL: crate $crate dependencies cannot be met
+      echo FAIL: crate $milestone dependencies cannot be met
       exit 1
    fi
    
    # Actual checks
-   echo DEPLOYING CRATE $crate
-   alr get -d --build -n $crate
+   echo DEPLOYING CRATE $milestone
+   if $is_binary; then 
+      echo SKIPPING BUILD for BINARY crate, FETCHING only
+      build_flag=""
+   else
+      build_flag="--build"
+   fi
+
+   alr get -d $build_flag -n $milestone
 
    if $is_system; then 
-      echo DETECTING INSTALLED PACKAGE via crate $crate
-      alr show -d --external-detect $crate
+      echo DETECTING INSTALLED PACKAGE via crate $milestone
+      alr show -d --external-detect $milestone
+   elif $is_binary; then
+      echo FETCHED BINARY crate OK
    else
-      echo LISTING EXECUTABLES of crate $crate
-      cd ${crate}_*
+      echo LISTING EXECUTABLES of crate $milestone
+      cd ${crate}_${version}_*
       alr run -d --list
       cd ..
    fi
 
-   echo CRATE $crate TEST ENDED SUCCESSFULLY
+   echo CRATE $milestone TEST ENDED SUCCESSFULLY
 done

From 26d9147abfcad9cd56281c23c2a3544615a6e892 Mon Sep 17 00:00:00 2001
From: "Gustavo A. Hoffmann" <gusthoff@users.noreply.github.com>
Date: Thu, 16 Sep 2021 11:05:38 +0200
Subject: [PATCH 2/3] audio_base 1.0.0 (#355)

* audio_base 1.0.0

* Converting license to SPDX string
---
 index/au/audio_base/audio_base-1.0.0.toml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 index/au/audio_base/audio_base-1.0.0.toml

diff --git a/index/au/audio_base/audio_base-1.0.0.toml b/index/au/audio_base/audio_base-1.0.0.toml
new file mode 100644
index 00000000..52aafb80
--- /dev/null
+++ b/index/au/audio_base/audio_base-1.0.0.toml
@@ -0,0 +1,18 @@
+description = "Basic Ada packages for audio applications"
+long-description = """
+# Audio Base
+This crate contains basic Ada packages for audio applications.
+"""
+name = "audio_base"
+version = "1.0.0"
+website="https://github.com/Ada-Audio/audio_base"
+licenses = "MIT"
+authors=["Gustavo A. Hoffmann"]
+maintainers = ["gusthoff@gusthoff.com"]
+maintainers-logins = ["gusthoff"]
+project-files = ["audio_base.gpr"]
+tags = ["audio", "riff"]
+
+[origin]
+commit = "8646d0adc2be09c57dd16952a329c4342e5ddb3b"
+url = "git+https://github.com/Ada-Audio/audio_base.git"

From 889ce5b21e4f3d5798c3a77b79380bd5681ea3f7 Mon Sep 17 00:00:00 2001
From: Fabien Chouteau <Fabien-Chouteau@users.noreply.github.com>
Date: Thu, 16 Sep 2021 15:43:42 +0200
Subject: [PATCH 3/3] Create clic-0.1.1.toml (#357)

---
 index/cl/clic/clic-0.1.1.toml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 index/cl/clic/clic-0.1.1.toml

diff --git a/index/cl/clic/clic-0.1.1.toml b/index/cl/clic/clic-0.1.1.toml
new file mode 100644
index 00000000..250b83b4
--- /dev/null
+++ b/index/cl/clic/clic-0.1.1.toml
@@ -0,0 +1,30 @@
+name = "clic"
+description = "Command Line Interface Components"
+version = "0.1.1"
+
+authors = ["Alejandro R. Mosteo", "Fabien Chouteau"]
+maintainers = ["alejandro@mosteo.com", "Fabien Chouteau <fabien.chouteau@gmail.com>"]
+maintainers-logins = ["mosteo", "Fabien-Chouteau"]
+licenses = "MIT"
+tags = ["cli", "command-line", "user-input", "tty"]
+website = "https://github.com/alire-project/clic"
+long-description = """
+Command Line Interface Components:
+ - "git like" subcommand handling
+ - TTY color and formatting
+ - User input queries
+"""
+
+# TODO: uncomment for alr 1.1.0
+# [configuration]
+# disabled = true # CLIC is an Alire dependency using git submodule, so we can't
+#                 # use the crate configuration here.
+
+[[depends-on]]
+aaa = "~0.2.3"
+simple_logging = "^1.2.0"
+ansiada = "~0.1.0"
+
+[origin]
+commit = "32a93777a3e1796534e07c59966075a3d6f4f503"
+url = "git+https://github.com/alire-project/clic.git"