fixup

Use the new unstable meson cargo support. This simplifies the
meson.build script and allows to use crates such as clap that require
picking up features from Cargo.toml.

This also allows us to not embed thiserror in subprojects, and instead
to simply place some patches and a meson.build in a specific directory
and meson will automatically pick them up.

.docker/Dockerfile

@@ -2,6 +2,8 @@ FROM gentoo/stage3:latest
 
 COPY ./. /
 
+ENV EGIT_CLONE_TYPE=shallow
+
 RUN getuto
 
 RUN emerge-webrsync
@@ -14,6 +16,7 @@ RUN emerge \
     sys-process/parallel \
     net-libs/nodejs
 
+
 RUN git clone https://jturnerusa.dev/cgit/ebuilds/ /var/db/repos/spawns
 
 COPY etc/portage/repos.conf /etc/portage/

.docker/etc/portage/package.accept_keywords/jturnerusa

@@ -1 +0,0 @@
-sec-keys/jturnerusa

.gitea/workflows/gentoo-utils.yml

@@ -89,7 +89,7 @@ jobs:
       image_tag: ${{ steps.image-changes.outputs.image_tag }}
 
   build:
-    runs-on: gentoo
+    runs-on: brutalisk
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -108,7 +108,7 @@ jobs:
   # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
   # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
   test:
-    runs-on: gentoo
+    runs-on: brutalisk
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -126,7 +126,7 @@ jobs:
           ninja test -C build
 
   fuzz:
-    runs-on: gentoo
+    runs-on: brutalisk
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -158,7 +158,7 @@ jobs:
         continue-on-error: true
 
   check-format:
-    runs-on: gentoo
+    runs-on: brutalisk
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -173,7 +173,7 @@ jobs:
           ninja rustfmt -C build
 
   docs:
-    runs-on: gentoo
+    runs-on: brutalisk
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -187,7 +187,7 @@ jobs:
           ninja rustdoc -C docs
 
   grep:
-    runs-on: gentoo
+    runs-on: brutalisk
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}

.gitignore

@@ -2,5 +2,4 @@
 /subprojects
 !/subprojects
 /subprojects/*
-!/subprojects/packagefiles
+!/subprojects/packagefiles
-!/subprojects/*.wrap

subprojects/thiserror-2-rs.wrap

@@ -1,10 +0,0 @@
-[wrap-file]
-directory = thiserror-2.0.17
-source_url = https://crates.io/api/v1/crates/thiserror/2.0.17/download
-source_filename = thiserror-2.0.17.tar.gz
-source_hash = f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8
-method = cargo
-diff_files = thiserror-2.0.17-include.patch
-
-# bump this version number on every change to meson.build or the patches:
-# v2

subprojects/thiserror-impl-2-rs.wrap

@@ -1,10 +0,0 @@
-[wrap-file]
-directory = thiserror-impl-2.0.17
-source_url = https://crates.io/api/v1/crates/thiserror-impl/2.0.17/download
-source_filename = thiserror-impl-2.0.17.tar.gz
-source_hash = 3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913
-method = cargo
-diff_files = thiserror-impl-2.0.17-include.patch
-
-# bump this version number on every change to meson.build or the patches:
-# v2