diff --git a/cairo.yaml b/cairo.yaml
index e9b7fecb6b3..351edab783f 100644
--- a/cairo.yaml
+++ b/cairo.yaml
@@ -1,7 +1,7 @@
 package:
   name: cairo
   version: "1.18.4"
-  epoch: 1
+  epoch: 2
   description: A vector graphics library
   copyright:
     - license: LGPL-2.1
@@ -29,10 +29,11 @@ environment:
       - zlib-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 6d9281e786fd289d382324d4588d59973a36911e1865b40e64f9ec39936ceba8
-      uri: https://gitlab.freedesktop.org/cairo/cairo/-/archive/${{package.version}}/cairo-${{package.version}}.tar.bz2
+      repository: https://gitlab.freedesktop.org/cairo/cairo
+      tag: ${{package.version}}
+      expected-commit: 4541e0cd3a751b85e52e2a83d02ac6145a5efa85
 
   - runs: |
       meson . output \
diff --git a/dbus-glib.yaml b/dbus-glib.yaml
index 14b468543b5..3089e1a6fa8 100644
--- a/dbus-glib.yaml
+++ b/dbus-glib.yaml
@@ -1,7 +1,7 @@
 package:
   name: dbus-glib
   version: "0.114"
-  epoch: 1
+  epoch: 2
   description: GLib bindings for DBUS
   copyright:
     - license: AFL-2.1 OR GPL-2.0-or-later
@@ -18,14 +18,23 @@ environment:
       - expat-dev
       - gettext-dev
       - glib-dev
+      - gtk-doc
+      - libtool
+      - pkgconf-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c
-      uri: https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/dbus/dbus-glib
+      tag: dbus-glib-${{package.version}}
+      expected-commit: 623a4f3386a675060335e20afd810c6e10ae2cc8
+
+  - runs: NOCONFIGURE=1 ./autogen.sh
 
   - uses: autoconf/configure
+    with:
+      opts: |
+        --enable-gtk-doc
 
   - uses: autoconf/make
 
diff --git a/glu.yaml b/glu.yaml
index 5633f69963e..43706cbefcd 100644
--- a/glu.yaml
+++ b/glu.yaml
@@ -1,7 +1,7 @@
 package:
   name: glu
   version: 9.0.3
-  epoch: 4
+  epoch: 5
   description: "Mesa OpenGL Utility library"
   copyright:
     - license: SGI-B-1.1
@@ -13,10 +13,11 @@ environment:
       - mesa-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      uri: https://mesa.freedesktop.org/archive/glu/glu-${{package.version}}.tar.xz
-      expected-sha512: b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba
+      repository: https://gitlab.freedesktop.org/mesa/glu
+      tag: glu-${{package.version}}
+      expected-commit: a2b96c7bba8db8fec3e02fb4227a7f7b02cabad1
 
   - uses: meson/configure
     with:
diff --git a/hicolor-icon-theme.yaml b/hicolor-icon-theme.yaml
index 1eacc184b80..df82de1b451 100644
--- a/hicolor-icon-theme.yaml
+++ b/hicolor-icon-theme.yaml
@@ -1,7 +1,7 @@
 package:
   name: hicolor-icon-theme
   version: "0.18"
-  epoch: 2
+  epoch: 3
   description: Freedesktop.org Hicolor icon theme
   copyright:
     - license: GPL-2.0-only
@@ -16,10 +16,11 @@ environment:
       - ca-certificates-bundle
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      uri: https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-${{package.version}}.tar.xz
-      expected-sha512: 07db44fb6bec797445740832fa2b3ba56f5f335834161a26a4e5f767a8c45c0885ef1189e887b56752bd20c4b1aac101c5d4a395df4177cd3817ee5105db0d37
+      repository: https://gitlab.freedesktop.org/xdg/default-icon-theme
+      tag: v${{package.version}}
+      expected-commit: a6dd02575b9e3d9e3e476b135ba92738563fe763
 
   - uses: meson/configure
 
diff --git a/libbsd.yaml b/libbsd.yaml
index b2eb0347999..b5c4f5832b2 100644
--- a/libbsd.yaml
+++ b/libbsd.yaml
@@ -1,7 +1,7 @@
 package:
   name: libbsd
   version: 0.12.2
-  epoch: 3
+  epoch: 4
   description: commonly-used BSD functions not implemented by all libcs
   copyright:
     - license: BSD-3-Clause
@@ -15,12 +15,14 @@ environment:
       - busybox
       - ca-certificates-bundle
       - libmd-dev
+      - libtool
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014
-      uri: https://libbsd.freedesktop.org/releases/libbsd-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/libbsd/libbsd
+      tag: ${{package.version}}
+      expected-commit: 04a24db27ad1572f766bad772cdd9c146e6d9cf0
 
   - uses: autoconf/configure
 
diff --git a/libdrm.yaml b/libdrm.yaml
index 73bd5a42003..163dd863515 100644
--- a/libdrm.yaml
+++ b/libdrm.yaml
@@ -2,7 +2,7 @@
 package:
   name: libdrm
   version: "2.4.131"
-  epoch: 0
+  epoch: 1
   description: Userspace interface to kernel DRM services
   copyright:
     - license: MIT
@@ -23,10 +23,11 @@ environment:
     CFLAGS: "-O2"
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 5cbdcc32e45c86e070818856f9431a70ca71195ed04b1f2d89602967ae768fe4
-      uri: https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${{package.version}}/drm-libdrm-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/mesa/libdrm
+      tag: libdrm-${{package.version}}
+      expected-commit: 6bfcfc725fbe0ece0918535556d61ee567b1ffff
 
   - runs: |
       meson \
diff --git a/libevdev.yaml b/libevdev.yaml
index 0c66ee9ae25..34dbc4393fe 100644
--- a/libevdev.yaml
+++ b/libevdev.yaml
@@ -1,7 +1,7 @@
 package:
   name: libevdev
   version: "1.13.6"
-  epoch: 0
+  epoch: 1
   description: Kernel Evdev Device Wrapper Library
   copyright:
     - license: MIT
@@ -19,10 +19,11 @@ environment:
       - python3
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 73f215eccbd8233f414737ac06bca2687e67c44b97d2d7576091aa9718551110
-      uri: https://www.freedesktop.org/software/libevdev/libevdev-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/libevdev/libevdev
+      tag: libevdev-${{package.version}}
+      expected-commit: 139b58e135184f66a35c2401771f3d8134f097ad
 
   - uses: meson/configure
     with:
diff --git a/libglvnd.yaml b/libglvnd.yaml
index 08fdb5bd41f..227f0002f2a 100644
--- a/libglvnd.yaml
+++ b/libglvnd.yaml
@@ -1,7 +1,7 @@
 package:
   name: libglvnd
   version: 1.7.0
-  epoch: 6
+  epoch: 7
   description: The GL Vendor-Neutral Dispatch library
   copyright:
     - license: GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Apache-2.0
@@ -28,10 +28,11 @@ environment:
       - xorgproto
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 2b6e15b06aafb4c0b6e2348124808cbd9b291c647299eaaba2e3202f51ff2f3d
-      uri: https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v${{package.version}}/libglvnd-v${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/glvnd/libglvnd
+      tag: v${{package.version}}
+      expected-commit: faa23f21fc677af5792825dc30cb1ccef4bf33a6
 
   - runs: |
       ./autogen.sh
diff --git a/libinput.yaml b/libinput.yaml
index 0beb49db45b..2106ce30a43 100644
--- a/libinput.yaml
+++ b/libinput.yaml
@@ -2,7 +2,7 @@
 package:
   name: libinput
   version: "1.30.1"
-  epoch: 0
+  epoch: 1
   description: Library for handling input devices
   copyright:
     - license: MIT
@@ -26,10 +26,11 @@ environment:
       - systemd-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 4339a2b9cc96ede3c120dedaedc61e48ce567808c5229e66587525ea972ef617
-      uri: https://gitlab.freedesktop.org/libinput/libinput/-/archive/${{package.version}}/libinput-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/libinput/libinput
+      tag: ${{package.version}}
+      expected-commit: baf1ceca88b3a668dd263f50bfaddfd205306028
 
   - uses: meson/configure
     with:
diff --git a/libslirp.yaml b/libslirp.yaml
index 4da92858b64..6eac4e1f7b8 100644
--- a/libslirp.yaml
+++ b/libslirp.yaml
@@ -1,7 +1,7 @@
 package:
   name: libslirp
   version: "4.9.1"
-  epoch: 1
+  epoch: 2
   description: A general purpose TCP-IP emulator
   copyright:
     - license: BSD-3-Clause
@@ -16,10 +16,11 @@ environment:
       - meson
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      uri: https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${{package.version}}/libslirp-v${{package.version}}.tar.gz
-      expected-sha512: cdb66f6280a9982de3c32269aee352bdf225db918590255abaed9bcd0aee4e996d2d8c2c3f62473f57485603ec29fd35723b0649d3ec3c41cc28b22ce913f63b
+      repository: https://gitlab.freedesktop.org/slirp/libslirp
+      tag: v${{package.version}}
+      expected-commit: 9c744e1e52aa0d9646ed91d789d588696292c21e
 
   - uses: meson/configure
 
diff --git a/libvdpau.yaml b/libvdpau.yaml
index 9d3d95f6264..2100fa22567 100644
--- a/libvdpau.yaml
+++ b/libvdpau.yaml
@@ -2,7 +2,7 @@
 package:
   name: libvdpau
   version: "1.5"
-  epoch: 3
+  epoch: 4
   description: Hardware-accelerated video playback library
   copyright:
     - license: MIT
@@ -21,10 +21,11 @@ environment:
       - xorgproto
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 66490802f30426d30ff9e8af35263bbbbaa23b52d0a2d797d06959c3d19638fd
-      uri: https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${{package.version}}/libvdpau-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/vdpau/libvdpau
+      tag: ${{package.version}}
+      expected-commit: 79f1506a3307d3275b0fdfb2e110c173f68e6f78
 
   - runs: |
       meson \
diff --git a/orc.yaml b/orc.yaml
index d3f94a2c93e..983615fbe6c 100644
--- a/orc.yaml
+++ b/orc.yaml
@@ -1,7 +1,7 @@
 package:
   name: orc
   version: "0.4.41"
-  epoch: 2
+  epoch: 3
   description: Oil Run-time Compiler
   copyright:
     - license: BSD-3-Clause
@@ -16,10 +16,11 @@ environment:
       - meson
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha512: 8c1dc497b2e2dd9a071ea0cb66bbf4bda0bad64f41c1ce0b9c87eb61c1fcf27d4cbef6c30ef00fed57c3623458aa683d39904f7c37072072eda6c51bcdd94091
-      uri: https://gstreamer.freedesktop.org/src/orc/orc-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/gstreamer/orc
+      tag: ${{package.version}}
+      expected-commit: 96dfe82ae431d8e4e06b6092171e231d693a73b5
 
   - uses: meson/configure
     with:
diff --git a/pulseaudio.yaml b/pulseaudio.yaml
index ab939246255..08197216ceb 100644
--- a/pulseaudio.yaml
+++ b/pulseaudio.yaml
@@ -2,7 +2,7 @@
 package:
   name: pulseaudio
   version: "17.0"
-  epoch: 4
+  epoch: 5
   description: featureful, general-purpose sound server
   copyright:
     - license: LGPL-2.1-or-later
@@ -65,10 +65,11 @@ environment:
       - tdb-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 053794d6671a3e397d849e478a80b82a63cb9d8ca296bd35b73317bb5ceb87b5
-      uri: https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/pulseaudio/pulseaudio
+      tag: v${{package.version}}
+      expected-commit: 1f020889c9aa44ea0f63d7222e8c2b62c3f45f68
 
   - uses: meson/configure
     with:
diff --git a/py3-libevdev.yaml b/py3-libevdev.yaml
index 6bbc5f80b9f..521d3916637 100644
--- a/py3-libevdev.yaml
+++ b/py3-libevdev.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-libevdev
   version: "0.13.1"
-  epoch: 0
+  epoch: 1
   description: Python3 wrapper around the evdev library
   copyright:
     - license: MIT
@@ -28,10 +28,11 @@ environment:
       - py3-supported-hatchling
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 2eb3688fc52244330c4837f0e446122b9726da777a3f301fe3b0c73f92202036
-      uri: https://gitlab.freedesktop.org/libevdev/python-libevdev/-/archive/${{package.version}}/python-libevdev-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/libevdev/python-libevdev
+      tag: ${{package.version}}
+      expected-commit: 31c142d109d61cf690d330e55eee9f14b4a74f94
 
 subpackages:
   - range: py-versions
diff --git a/rarian.yaml b/rarian.yaml
index 501b67a18c3..1c12144c33f 100644
--- a/rarian.yaml
+++ b/rarian.yaml
@@ -1,7 +1,7 @@
 package:
   name: rarian
   version: 0.8.6
-  epoch: 1
+  epoch: 2
   description: Documentation meta-data library, designed as a replacement for Scrollkeeper.
   copyright:
     - license: GPL-2.0-or-later OR LGPL-2.1-or-later OR Zlib
@@ -15,15 +15,20 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - libtool
       - libxslt-dev
+      - pkgconf-dev
       - tinyxml2
       - tinyxml2-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 9d4f7873009d2e31b8b1ec762606b12bee5526e1fe75de48e9495382bfef2bea
-      uri: https://gitlab.freedesktop.org/rarian/rarian/-/releases/${{package.version}}/downloads/assets/rarian-${{package.version}}.tar.bz2
+      repository: https://gitlab.freedesktop.org/rarian/rarian
+      tag: ${{package.version}}
+      expected-commit: b256945b6201b98c7a5bf08a41e148465e9b70dd
+
+  - runs: ./autogen.sh
 
   - uses: autoconf/configure
     with:
diff --git a/shared-mime-info.yaml b/shared-mime-info.yaml
index 4105a246a48..265cf4a1205 100644
--- a/shared-mime-info.yaml
+++ b/shared-mime-info.yaml
@@ -1,7 +1,7 @@
 package:
   name: shared-mime-info
   version: "2.4"
-  epoch: 6
+  epoch: 7
   description: Freedesktop.org Shared MIME Info
   copyright:
     - license: GPL-2.0-or-later
@@ -23,10 +23,11 @@ environment:
       - xmlto
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 531291d0387eb94e16e775d7e73788d06d2b2fdd8cd2ac6b6b15287593b6a2de
-      uri: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${{package.version}}/shared-mime-info-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/xdg/shared-mime-info
+      tag: ${{package.version}}
+      expected-commit: 9a6d6b8e963935f145f3a1ef446552de6996dada
 
   - uses: meson/configure
     with:
diff --git a/startup-notification.yaml b/startup-notification.yaml
index d78acfb96bf..deb1ce9bde6 100644
--- a/startup-notification.yaml
+++ b/startup-notification.yaml
@@ -2,7 +2,7 @@
 package:
   name: startup-notification
   version: "0.12"
-  epoch: 2
+  epoch: 3
   description: Monitor and display application startup
   copyright:
     - license: LGPL-2.0-or-later
@@ -33,10 +33,13 @@ var-transforms:
     to: mangled-package-version
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
-      uri: https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/xdg/startup-notification
+      tag: STARTUP_NOTIFICATION_${{vars.mangled-package-version}}
+      expected-commit: fce365db713897a9cc6b52cac6536f4cb9c3abf1
+
+  - runs: NOCONFIGURE=1 ./autogen.sh
 
   - runs: |
       echo "deleting libtool archive files before running configure"
diff --git a/xdg-utils.yaml b/xdg-utils.yaml
index 6d17255cb44..a8029d47ccc 100644
--- a/xdg-utils.yaml
+++ b/xdg-utils.yaml
@@ -2,7 +2,7 @@
 package:
   name: xdg-utils
   version: 1.2.1
-  epoch: 5
+  epoch: 6
   description: Basic desktop integration functions
   copyright:
     - license: MIT
@@ -26,10 +26,11 @@ environment:
       - xset
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: f6b648c064464c2636884c05746e80428110a576f8daacf46ef2e554dcfdae75
-      uri: https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${{package.version}}/xdg-utils-v${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/xdg/xdg-utils
+      tag: v${{package.version}}
+      expected-commit: 356c380ad6fecc9ce6bea1f6a77986ba67402c80
 
   - runs: autoreconf
 
diff --git a/xkeyboard-config.yaml b/xkeyboard-config.yaml
index 84a38562de4..bb5020de66c 100644
--- a/xkeyboard-config.yaml
+++ b/xkeyboard-config.yaml
@@ -2,7 +2,7 @@
 package:
   name: xkeyboard-config
   version: "2.46"
-  epoch: 0
+  epoch: 1
   description: X keyboard configuration files
   copyright:
     - license: MIT
@@ -22,10 +22,11 @@ environment:
       - python3
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 81107e12f71087b3f1d7dea43c186805d46abaffead0cafca9bdd24b94c2007e
-      uri: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-${{package.version}}/xkeyboard-config-xkeyboard-config-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+      tag: xkeyboard-config-${{package.version}}
+      expected-commit: 4225e14a2d0fca5a4f9cb8517cf12d96ea290d84
 
   - runs: |
       meson --prefix=/usr . output
diff --git a/xmessage.yaml b/xmessage.yaml
index a03ae5234a4..c706b295361 100644
--- a/xmessage.yaml
+++ b/xmessage.yaml
@@ -2,7 +2,7 @@
 package:
   name: xmessage
   version: 1.0.7
-  epoch: 4
+  epoch: 5
   description: Display a message or query in a window
   copyright:
     - license: MIT
@@ -25,10 +25,11 @@ environment:
       - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 703fccb7a0b772d61d7e603c189b9739866aa97ba985c727275420f829a30356
-      uri: https://xorg.freedesktop.org/archive/individual/app/xmessage-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/app/xmessage
+      tag: xmessage-${{package.version}}
+      expected-commit: 3b4db0f96b58076b17d1ae20b4c6a38a522dca58
 
   - uses: autoconf/configure