Update to 2.0.0

5 files changed, 65 insertions, 137 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a5b7d4b3d96..743901b783d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,41 @@
 pkgbase = alire
 	pkgdesc = A catalog of ready-to-use Ada libraries plus a command-line tool (alr) to obtain, build, and incorporate them into your own projects. It aims to fulfill a similar role to Rust's cargo or OCaml's opam.
-	pkgver = 1.2.2
-	pkgrel = 2
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://alire.ada.dev/
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	checkdepends = python-e3-testsuite
 	makedepends = git
 	makedepends = gprbuild
-	depends = gnatcoll-core
 	depends = unzip
-	source = alire-1.2.2.tar.gz::https://github.com/alire-project/alire/archive/refs/tags/v1.2.2.tar.gz
+	source = alire-2.0.0.tar.gz::https://github.com/alire-project/alire/archive/refs/tags/v2.0.0.tar.gz
 	source = alire.patch
-	source = gcc13.1.patch
-	source = toml_slicer.gcc13.1.patch
 	source = git+https://github.com/alire-project/xmlezout.git#commit=1fcbd0b9303d044d8f09a8ef652afa8c0400ee8b
 	source = git+https://github.com/mosteo/ajunitgen.git#commit=e5d01db5e7834d15c4066f0a8e33d780deae3cc9
-	source = git+https://github.com/mosteo/aaa.git#commit=906d9eaf4fb8efabfbc3d8cfb34d04ceec340e13
-	source = git+https://github.com/alire-project/semantic_versioning.git#commit=fe4e72e40786589a66d53662639f894fcdb3419c
-	source = git+https://github.com/alire-project/simple_logging.git#commit=02a7de7568af6af7cedd1048901fae8e9477b1d9
-	source = git+https://github.com/pmderodat/ada-toml.git#commit=2a671ffb1039a036f2bb68bdc88afc8d3dc68c10
-	source = git+https://github.com/alire-project/gnatcoll-core.git#commit=403efe11405113cf12ae3d014df474cf7a046176
-	source = git+https://github.com/mosteo/ansi-ada#commit=acf9afca3afe1f8b8843c061f3cef860d7567307
-	source = git+https://github.com/mosteo/uri-ada.git#commit=b61eba59099b3ab39e59e228fe4529927f9e849e
-	source = git+https://github.com/mosteo/minirest#commit=4550aa356d55b9cd55f26acd34701f646021c5ff
+	source = git+https://github.com/mosteo/aaa.git#commit=dff61d2615cc6332fa6205267bae19b4d044b9da
+	source = git+https://github.com/alire-project/semantic_versioning.git#commit=cc2148cf9c8934fb557b5ae49a3f7947194fa7ee
+	source = git+https://github.com/alire-project/simple_logging.git#commit=3505dc645f3eef6799a486aae223d37e88cfc4d5
+	source = git+https://github.com/pmderodat/ada-toml.git#commit=da4e59c382ceb0de6733d571ecbab7ea4919b33d
+	source = git+https://github.com/alire-project/gnatcoll-core.git#commit=4e663b87a028252e7e074f054f8f453661397166
+	source = git+https://github.com/mosteo/ansi-ada#commit=dc770a5a6cdaad8668c32b0cd4625a7d648f8ca2
+	source = git+https://github.com/mosteo/uri-ada.git#commit=02a0780d7757e9e79b3410c3a34960655cacea3d
+	source = git+https://github.com/mosteo/minirest#commit=9a9c660f9c6f27f5ef75417e7fac7061dff14d78
 	source = git+https://github.com/Fabien-Chouteau/spdx_ada#commit=2df9b1182544359c751544e52e14c94830d99fa6
-	source = git+https://github.com/HeisenbugLtd/si_units#commit=39de6478ba6d63c24dd34dd7205a6ce2cb971703
-	source = git+https://github.com/alire-project/clic#commit=185519d65b089c3238e24cfe87f1d22db1f3e0d9
+	source = git+https://github.com/alire-project/clic#commit=56bbdc008e16996b6f76e443fd0165a240de1b13
 	source = git+https://github.com/mosteo/optional#commit=0c7d20c0c8b48ccb6b25fb648d48382e598c25c3
-	source = git+https://github.com/mosteo/stopwatch#commit=86e7302d29f360f98f568b6015755229949b2194
-	source = git+https://github.com/mosteo/toml_slicer#commit=8b9dff0f450394b07ea71f0eb9b39d9c20e21f9c
-	b2sums = fc70ab6ba89dbe9d949700ad57dd9dce2f215c92731010a1bd255ef63e1beaddae852183a9cf2018eb2b054c69504d7785441356ab4299b1d0043896265ee8a7
-	b2sums = 15799818a362547fa67bc9e614a3ff5b4645e268f48a8a2fe451592410be3d1fae0ff0cc96853e22813e6aa5a2a9a434f8585e26cb4bb1d5b75263177b7b81a6
-	b2sums = aa6e4b91e7445eadf9ed4df1198a68067e590ebb4e394fe2ad476a7467b6c6dffe4fa22b6c12c0d94ae9e248f4ab93587dd948543c7d92da3a515558f221e323
-	b2sums = c1a012f0e421ea5fc1e07eea74920d64b5abd04a5073b346be9a3322ce489803c17f163377756398f0b592773e11befc9a505506ddbf53db138a5efec1142865
+	source = git+https://github.com/mosteo/stopwatch#commit=f607a63b714f09bbf6126de9851cbc21cf8666c9
+	source = git+https://github.com/mosteo/toml_slicer#branch=alire
+	source = git+https://github.com/mosteo/dirty_booleans#branch=alire
+	source = git+https://github.com/mosteo/diskflags#branch=alire
+	source = git+https://github.com/mosteo/si_units#branch=alire
+	source = git+https://github.com/mosteo/umwi.git#commit=34abe38402431ced3e2f2018acecc6dfa1ab860e
+	b2sums = 1323435d5a3591cbbf9e27d017caf3c426fe9aa571f8a092784acf8b85f350c885fc07f32c9670b0e32250bac4490387e0f022a3312b3cd7c0c2831d9d5c1a2a
+	b2sums = f817589eaa80cddff6b41154c57955e1698af8562b56edce8fccac9924d3f61be67ef26b7253fa77cf1e99f51a265208240a7c0984ceb44662d4da9223efa2e4
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f7f1af1d6b8b..8062637ad1e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,43 @@
 # Maintainer: Tim Lagnese <tim at inept tech>
 
 pkgname=alire
-pkgver=1.2.2
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A catalog of ready-to-use Ada libraries plus a command-line tool (alr) to obtain, build, and incorporate them into your own projects. It aims to fulfill a similar role to Rust's cargo or OCaml's opam."
 arch=('i686' 'x86_64')
 url="https://alire.ada.dev/"
 license=(GPL3)
-depends=(gnatcoll-core unzip)
+depends=(unzip)
 makedepends=(git gprbuild)
+checkdepends=(python-e3-testsuite)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/alire-project/alire/archive/refs/tags/v$pkgver.tar.gz"
 alire.patch
-gcc13.1.patch
-toml_slicer.gcc13.1.patch
 git+https://github.com/alire-project/xmlezout.git#commit=1fcbd0b9303d044d8f09a8ef652afa8c0400ee8b
 git+https://github.com/mosteo/ajunitgen.git#commit=e5d01db5e7834d15c4066f0a8e33d780deae3cc9
-git+https://github.com/mosteo/aaa.git#commit=906d9eaf4fb8efabfbc3d8cfb34d04ceec340e13
-git+https://github.com/alire-project/semantic_versioning.git#commit=fe4e72e40786589a66d53662639f894fcdb3419c
-git+https://github.com/alire-project/simple_logging.git#commit=02a7de7568af6af7cedd1048901fae8e9477b1d9
-git+https://github.com/pmderodat/ada-toml.git#commit=2a671ffb1039a036f2bb68bdc88afc8d3dc68c10
-git+https://github.com/alire-project/gnatcoll-core.git#commit=403efe11405113cf12ae3d014df474cf7a046176
-git+https://github.com/mosteo/ansi-ada#commit=acf9afca3afe1f8b8843c061f3cef860d7567307
-git+https://github.com/mosteo/uri-ada.git#commit=b61eba59099b3ab39e59e228fe4529927f9e849e
-git+https://github.com/mosteo/minirest#commit=4550aa356d55b9cd55f26acd34701f646021c5ff
+git+https://github.com/mosteo/aaa.git#commit=dff61d2615cc6332fa6205267bae19b4d044b9da
+git+https://github.com/alire-project/semantic_versioning.git#commit=cc2148cf9c8934fb557b5ae49a3f7947194fa7ee
+git+https://github.com/alire-project/simple_logging.git#commit=3505dc645f3eef6799a486aae223d37e88cfc4d5
+git+https://github.com/pmderodat/ada-toml.git#commit=da4e59c382ceb0de6733d571ecbab7ea4919b33d
+git+https://github.com/alire-project/gnatcoll-core.git#commit=4e663b87a028252e7e074f054f8f453661397166
+git+https://github.com/mosteo/ansi-ada#commit=dc770a5a6cdaad8668c32b0cd4625a7d648f8ca2
+git+https://github.com/mosteo/uri-ada.git#commit=02a0780d7757e9e79b3410c3a34960655cacea3d
+git+https://github.com/mosteo/minirest#commit=9a9c660f9c6f27f5ef75417e7fac7061dff14d78
 git+https://github.com/Fabien-Chouteau/spdx_ada#commit=2df9b1182544359c751544e52e14c94830d99fa6
-git+https://github.com/HeisenbugLtd/si_units#commit=39de6478ba6d63c24dd34dd7205a6ce2cb971703
-git+https://github.com/alire-project/clic#commit=185519d65b089c3238e24cfe87f1d22db1f3e0d9
+git+https://github.com/alire-project/clic#commit=56bbdc008e16996b6f76e443fd0165a240de1b13
 git+https://github.com/mosteo/optional#commit=0c7d20c0c8b48ccb6b25fb648d48382e598c25c3
-git+https://github.com/mosteo/stopwatch#commit=86e7302d29f360f98f568b6015755229949b2194
-git+https://github.com/mosteo/toml_slicer#commit=8b9dff0f450394b07ea71f0eb9b39d9c20e21f9c
+git+https://github.com/mosteo/stopwatch#commit=f607a63b714f09bbf6126de9851cbc21cf8666c9
+git+https://github.com/mosteo/toml_slicer#branch=alire
+git+https://github.com/mosteo/dirty_booleans#branch=alire
+git+https://github.com/mosteo/diskflags#branch=alire
+git+https://github.com/mosteo/si_units#branch=alire
+# Transitive dependency of aaa
+git+https://github.com/mosteo/umwi.git#commit=34abe38402431ced3e2f2018acecc6dfa1ab860e
 )
-b2sums=('fc70ab6ba89dbe9d949700ad57dd9dce2f215c92731010a1bd255ef63e1beaddae852183a9cf2018eb2b054c69504d7785441356ab4299b1d0043896265ee8a7'
-        '15799818a362547fa67bc9e614a3ff5b4645e268f48a8a2fe451592410be3d1fae0ff0cc96853e22813e6aa5a2a9a434f8585e26cb4bb1d5b75263177b7b81a6'
-        'aa6e4b91e7445eadf9ed4df1198a68067e590ebb4e394fe2ad476a7467b6c6dffe4fa22b6c12c0d94ae9e248f4ab93587dd948543c7d92da3a515558f221e323'
-        'c1a012f0e421ea5fc1e07eea74920d64b5abd04a5073b346be9a3322ce489803c17f163377756398f0b592773e11befc9a505506ddbf53db138a5efec1142865'
+b2sums=('1323435d5a3591cbbf9e27d017caf3c426fe9aa571f8a092784acf8b85f350c885fc07f32c9670b0e32250bac4490387e0f022a3312b3cd7c0c2831d9d5c1a2a'
+        'f817589eaa80cddff6b41154c57955e1698af8562b56edce8fccac9924d3f61be67ef26b7253fa77cf1e99f51a265208240a7c0984ceb44662d4da9223efa2e4'
+        'SKIP'
+        'SKIP'
+        'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
@@ -54,26 +58,22 @@ b2sums=('fc70ab6ba89dbe9d949700ad57dd9dce2f215c92731010a1bd255ef63e1beaddae85218
 prepare()
 {
   # Get the submodules from the sources above
-  cd "$srcdir/$pkgname-$pkgver"
   patch --strip=1 < "$srcdir/alire.patch"
-  patch --strip=1 < "$srcdir/gcc13.1.patch"
-  cd "../toml_slicer"
-  patch --strip=1 < "$srcdir/toml_slicer.gcc13.1.patch"
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  gprbuild -j0 -P alr_env
+  gprbuild -j0 -P alr_env -XALIRE_OS=linux
 }
 
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver/testsuite"
-#  PATH="$srcdir/$pkgname-$pkgver/bin:$PATH" GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=/dev/null ./run.py
-#}
+check() {
+  cd "$srcdir/$pkgname-$pkgver/testsuite"
+  ./run.py
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  gprinstall -P alr_env -p --prefix="$pkgdir/usr"
+  gprinstall -P alr_env -p --prefix="$pkgdir/usr" -XALIRE_OS=linux
   install -D scripts/alr-completion.bash "$pkgdir/usr/share/bash-completion/completions/alr"
 }
 
diff --git a/alire.patch b/alire.patch
index b8f122fc08b6..780ee54654e7 100644
--- a/alire.patch
+++ b/alire.patch
@@ -1,8 +1,8 @@
-Index: alire-1.2.0/alr_env.gpr
+Index: src/alire-2.0.0/alr_env.gpr
 ===================================================================
---- alire-1.2.0.orig/alr_env.gpr
-+++ alire-1.2.0/alr_env.gpr
-@@ -3,22 +3,22 @@ aggregate project Alr_Env is
+--- src.orig/alire-2.0.0/alr_env.gpr
++++ src/alire-2.0.0/alr_env.gpr
+@@ -9,25 +9,25 @@ aggregate project Alr_Env is
     for Create_Missing_Dirs use "True";
  
     for Project_Path use (
@@ -11,6 +11,8 @@ Index: alire-1.2.0/alr_env.gpr
 -                         "deps/ajunitgen",
 -                         "deps/ansi",
 -                         "deps/clic",
+-                         "deps/dirty_booleans",
+-                         "deps/diskflags",
 -                         "deps/gnatcoll-slim",
 -                         "deps/minirest",
 -                         "deps/optional",
@@ -20,6 +22,7 @@ Index: alire-1.2.0/alr_env.gpr
 -                         "deps/spdx",
 -                         "deps/stopwatch",
 -                         "deps/toml_slicer",
+-                         "deps/umwi",
 -                         "deps/uri-ada",
 -                         "deps/xmlezout"
 +                         "../aaa",
@@ -27,6 +30,8 @@ Index: alire-1.2.0/alr_env.gpr
 +                         "../ajunitgen",
 +                         "../ansi-ada",
 +                         "../clic",
++                         "../dirty_booleans",
++                         "../diskflags",
 +                         "../gnatcoll-core",
 +                         "../minirest",
 +                         "../optional",
@@ -36,6 +41,7 @@ Index: alire-1.2.0/alr_env.gpr
 +                         "../spdx_ada",
 +                         "../stopwatch",
 +                         "../toml_slicer",
++                         "../umwi",
 +                         "../uri-ada",
 +                         "../xmlezout"
                          );
diff --git a/gcc13.1.patch b/gcc13.1.patch
deleted file mode 100644
index e150bff9e59c..000000000000
--- a/gcc13.1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: alire-1.2.2/alire.toml
-===================================================================
---- alire-1.2.2.orig/alire.toml
-+++ alire-1.2.2/alire.toml
-@@ -46,7 +46,7 @@ ada_toml = { url = "https://github.com/p
- ajunitgen = { url = "https://github.com/mosteo/ajunitgen.git", commit = "e5d01db5e7834d15c4066f0a8e33d780deae3cc9" }
- ansiada = { url = "https://github.com/mosteo/ansi-ada.git", commit = "acf9afca3afe1f8b8843c061f3cef860d7567307" }
- clic = { url = "https://github.com/alire-project/clic.git", commit = "185519d65b089c3238e24cfe87f1d22db1f3e0d9" }
--gnatcoll = { url = "https://github.com/alire-project/gnatcoll-core.git", commit = "92bb91130a9ec628b4c48b7ef9fe7f24d9dc25fa" }
-+gnatcoll = { url = "https://github.com/alire-project/gnatcoll-core.git", commit = "403efe11405113cf12ae3d014df474cf7a046176" }
- minirest = { url = "https://github.com/mosteo/minirest.git", commit = "4550aa356d55b9cd55f26acd34701f646021c5ff" }
- optional = { url = "https://github.com/mosteo/optional.git", commit = "0c7d20c0c8b48ccb6b25fb648d48382e598c25c3" }
- semantic_versioning = { url = "https://github.com/alire-project/semantic_versioning.git", commit = "fe4e72e40786589a66d53662639f894fcdb3419c" }
-Index: alire-1.2.2/src/alire/alire-index_on_disk-loading.adb
-===================================================================
---- alire-1.2.2.orig/src/alire/alire-index_on_disk-loading.adb
-+++ alire-1.2.2/src/alire/alire-index_on_disk-loading.adb
-@@ -236,7 +236,6 @@ package body Alire.Index_On_Disk.Loading
-       Indexes := Find_All (From, Result);
-       if not Result.Success then
-          Raise_Checked_Error (Message (Result));
--         return;
-       end if;
- 
-       if Indexes.Is_Empty then
-@@ -248,7 +248,6 @@ package body Alire.Index_On_Disk.Loading
-             if not Outcome.Success then
-                Raise_Checked_Error
-                  ("Could not add community index: " & Message (Outcome));
--               return;
-             end if;
-          end;
-       end if;
-Index: alire-1.2.2/src/alire/alire-solutions.ads
-===================================================================
---- alire-1.2.2.orig/src/alire/alire-solutions.ads
-+++ alire-1.2.2/src/alire/alire-solutions.ads
-@@ -420,6 +420,17 @@ package Alire.Solutions is
-    --  a safe-order traversal of a solution. This procedure is currently
-    --  sequential but it could be parallelized in the future.
- 
-+   function Pin_Dependencies (This  : Solution;
-+                              Crate : Crate_Name;
-+                              Props : Alire.Properties.Vector)
-+                              return Conditional.Dependencies
-+   is (if This.State (Crate).Has_Release
-+       then This.State (Crate).Release.Dependencies (Props)
-+       else Conditional.No_Dependencies);
-+   --  If Crate is pinned in This and it has a release, return its
-+   --  dependencies; otherwise return Empty. WORKAROUND FOR VISIBILITY BUG
-+   --  IN GCC 13.1
-+
- private
- 
-    type Solution is new Interfaces.Tomifiable with record
-Index: alire-1.2.2/src/alr/alr-commands-search.adb
-===================================================================
---- alire-1.2.2.orig/src/alr/alr-commands-search.adb
-+++ alire-1.2.2/src/alr/alr-commands-search.adb
-@@ -91,8 +91,6 @@ package body Alr.Commands.Search is
-          Tab.Append (Alire.Index.Crate (Name).TTY_Description);
-          Tab.Append (Ext.Image);
-       end List_Undetected;
--
--      use Alire.Releases.Containers.Release_Sets;
-    begin
- 
-       --  First, simpler case of search into crates
diff --git a/toml_slicer.gcc13.1.patch b/toml_slicer.gcc13.1.patch
deleted file mode 100644
index 3cee5efd6900..000000000000
--- a/toml_slicer.gcc13.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: toml_slicer/src/toml_slicer.adb
-===================================================================
---- toml_slicer.orig/src/toml_slicer.adb
-+++ toml_slicer/src/toml_slicer.adb
-@@ -207,7 +207,6 @@ package body TOML_Slicer is
-                raise Slicing_Error with
-                  "Could not find removable entry " & Entry_Name
-                  & " in array " & Array_Name & " in file " & File_Name;
--               return;
-             end if;
-          end Remove_Target;
-