diff --git a/mingw-w64-ada_spawn/PKGBUILD b/mingw-w64-ada_spawn/PKGBUILD
index 7cc377eae7..be8dfdccf0 100644
--- a/mingw-w64-ada_spawn/PKGBUILD
+++ b/mingw-w64-ada_spawn/PKGBUILD
@@ -5,7 +5,7 @@ _realname=ada_spawn
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Ada API to spawn processes and communicate with them (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-adasat/PKGBUILD b/mingw-w64-adasat/PKGBUILD
index dac1d7d433..ffdbac972a 100644
--- a/mingw-w64-adasat/PKGBUILD
+++ b/mingw-w64-adasat/PKGBUILD
@@ -4,7 +4,7 @@ _realname=adasat
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of a DPLL-based SAT solver in Ada (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-gnatcoll-bindings/PKGBUILD b/mingw-w64-gnatcoll-bindings/PKGBUILD
index 5879cc908f..2a19715da1 100644
--- a/mingw-w64-gnatcoll-bindings/PKGBUILD
+++ b/mingw-w64-gnatcoll-bindings/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=(${MINGW_PACKAGE_PREFIX}-gnatcoll-gmp
          ${MINGW_PACKAGE_PREFIX}-gnatcoll-readline
          ${MINGW_PACKAGE_PREFIX}-gnatcoll-zlib)
 pkgver=25.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GNAT Components Collection - Language and library bindings. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-gnatcoll-core/PKGBUILD b/mingw-w64-gnatcoll-core/PKGBUILD
index 4e8c823363..97c5a4687f 100644
--- a/mingw-w64-gnatcoll-core/PKGBUILD
+++ b/mingw-w64-gnatcoll-core/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 replaces=("${MINGW_PACKAGE_PREFIX}-gnatcoll")
 conflicts=("${MINGW_PACKAGE_PREFIX}-gnatcoll")
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNAT Components Collection - Core packages (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-gnatdoc/PKGBUILD b/mingw-w64-gnatdoc/PKGBUILD
index 8c496e7c1e..bc39960be0 100644
--- a/mingw-w64-gnatdoc/PKGBUILD
+++ b/mingw-w64-gnatdoc/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gnatdoc
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GNAT documentation generation tool (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-gnatformat/PKGBUILD b/mingw-w64-gnatformat/PKGBUILD
index fdb4945278..b526e6a4c2 100644
--- a/mingw-w64-gnatformat/PKGBUILD
+++ b/mingw-w64-gnatformat/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gnatformat
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An opinionated code formatter for the Ada language. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-gpr/PKGBUILD b/mingw-w64-gpr/PKGBUILD
index d3a6ded123..0a35f9b054 100644
--- a/mingw-w64-gpr/PKGBUILD
+++ b/mingw-w64-gpr/PKGBUILD
@@ -3,7 +3,7 @@ _realname=gpr
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The framework for analyzing the GNAT Project (GPR) files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -13,15 +13,15 @@ msys2_references=(
   'gentoo: dev-ada/gpr'
 )
 license=('spdx:(Apache-2.0 WITH LLVM-exception) AND GPL-3.0-or-later')
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada"
-             "${MINGW_PACKAGE_PREFIX}-gprbuild"
-             "${MINGW_PACKAGE_PREFIX}-python-e3-core")
-depends=("${MINGW_PACKAGE_PREFIX}-gnatcoll-core"
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-ada"
+         "${MINGW_PACKAGE_PREFIX}-gnatcoll-core"
          "${MINGW_PACKAGE_PREFIX}-gnatcoll-iconv"
          "${MINGW_PACKAGE_PREFIX}-gnatcoll-gmp"
          "${MINGW_PACKAGE_PREFIX}-python-funcy"
          "${MINGW_PACKAGE_PREFIX}-python-mako"
          "${MINGW_PACKAGE_PREFIX}-python-docutils")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
+             "${MINGW_PACKAGE_PREFIX}-python-e3-core")
 source=("https://github.com/AdaCore/gpr/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         001-fix-build-with-gcc-ada-14.patch)
 sha256sums=('2a0cdbb42cdd5440cbb06cbe3a2075c9ca7ccb82225bb3491509f930593ab33e'
diff --git a/mingw-w64-gtkada/PKGBUILD b/mingw-w64-gtkada/PKGBUILD
index 1dd9c40060..7d594dc407 100644
--- a/mingw-w64-gtkada/PKGBUILD
+++ b/mingw-w64-gtkada/PKGBUILD
@@ -14,8 +14,6 @@ msys2_references=(
   'aur: gtkada'
 )
 license=('spdx:GPL-3.0-or-later with GCC-exception-3.1')
-makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-gcc-ada"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -24,6 +22,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-pango")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=("https://github.com/AdaCore/gtkada/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('bc6614072d0733bc112c4d0b0f0d6ff3fc0eb8021761efec8d9a00a1975dfec9')
 
diff --git a/mingw-w64-lal-refactor/PKGBUILD b/mingw-w64-lal-refactor/PKGBUILD
index d37bd061dc..27157b3dba 100644
--- a/mingw-w64-lal-refactor/PKGBUILD
+++ b/mingw-w64-lal-refactor/PKGBUILD
@@ -4,7 +4,7 @@ _realname=lal-refactor
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Source code refactoring tools for the Ada programming language, leveraging the power of Libadalang (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-langkit_support/PKGBUILD b/mingw-w64-langkit_support/PKGBUILD
index b6e9a2bb18..c19775ced4 100644
--- a/mingw-w64-langkit_support/PKGBUILD
+++ b/mingw-w64-langkit_support/PKGBUILD
@@ -4,7 +4,7 @@ _realname=langkit_support
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Common code needed by parsers generated by Langkit, a language creation framework (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -13,9 +13,6 @@ msys2_references=(
 )
 license=('spdx:Apache-2.0 WITH LLVM-exception')
 url="https://github.com/AdaCore/langkit"
-makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
-             "${MINGW_PACKAGE_PREFIX}-langkit"
-             "${MINGW_PACKAGE_PREFIX}-python")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gnatcoll-core"
          "${MINGW_PACKAGE_PREFIX}-gnatcoll-gmp"
@@ -25,6 +22,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
          "${MINGW_PACKAGE_PREFIX}-libvss"
          "${MINGW_PACKAGE_PREFIX}-prettier-ada")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
+             "${MINGW_PACKAGE_PREFIX}-langkit"
+             "${MINGW_PACKAGE_PREFIX}-python")
 source=("https://github.com/AdaCore/langkit/archive/v${pkgver}/langkit-${pkgver}.tar.gz")
 sha256sums=('de7976a815b810da98c841c475a0d0d83ed45dc1016c71327902ba63aa0d651c')
 
diff --git a/mingw-w64-libadalang-tools/PKGBUILD b/mingw-w64-libadalang-tools/PKGBUILD
index d64fc2f8a1..b317d7009d 100644
--- a/mingw-w64-libadalang-tools/PKGBUILD
+++ b/mingw-w64-libadalang-tools/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libadalang-tools
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Libadalang-based tools for Ada: gnatpp, gnatmetric, gnatstub and gnattest (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-libadalang/PKGBUILD b/mingw-w64-libadalang/PKGBUILD
index 3b223da020..4b77bf1fd6 100644
--- a/mingw-w64-libadalang/PKGBUILD
+++ b/mingw-w64-libadalang/PKGBUILD
@@ -4,8 +4,7 @@ _realname=libadalang
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
-
+pkgrel=2
 pkgdesc="Library for parsing and semantic analysis of Ada code (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -15,17 +14,6 @@ msys2_references=(
   'gentoo: dev-ada/libadalang'
 )
 license=('spdx:Apache-2.0 WITH LLVM-exception')
-makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
-             "${MINGW_PACKAGE_PREFIX}-langkit"
-             "${MINGW_PACKAGE_PREFIX}-liblktlang"
-             "${MINGW_PACKAGE_PREFIX}-python-build"
-             "${MINGW_PACKAGE_PREFIX}-python-docutils"
-             "${MINGW_PACKAGE_PREFIX}-python-e3-core"
-             "${MINGW_PACKAGE_PREFIX}-python-funcy"
-             "${MINGW_PACKAGE_PREFIX}-python-installer"
-             "${MINGW_PACKAGE_PREFIX}-python-mako"
-             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python-sphinx")
 depends=("${MINGW_PACKAGE_PREFIX}-adasat"
          "${MINGW_PACKAGE_PREFIX}-gcc-ada"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -37,6 +25,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-adasat"
          "${MINGW_PACKAGE_PREFIX}-langkit_support"
          "${MINGW_PACKAGE_PREFIX}-libgpr"
          "${MINGW_PACKAGE_PREFIX}-xmlada")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
+             "${MINGW_PACKAGE_PREFIX}-langkit"
+             "${MINGW_PACKAGE_PREFIX}-liblktlang"
+             "${MINGW_PACKAGE_PREFIX}-python-build"
+             "${MINGW_PACKAGE_PREFIX}-python-docutils"
+             "${MINGW_PACKAGE_PREFIX}-python-e3-core"
+             "${MINGW_PACKAGE_PREFIX}-python-funcy"
+             "${MINGW_PACKAGE_PREFIX}-python-installer"
+             "${MINGW_PACKAGE_PREFIX}-python-mako"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-sphinx")
 options=('!strip')
 source=("https://github.com/AdaCore/libadalang/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('98b4f5ade46c51aa68e4c4eff28db7e36019e98be4bf88eebd728f0ba2d54c0d')
diff --git a/mingw-w64-libgpr/PKGBUILD b/mingw-w64-libgpr/PKGBUILD
index a97de0b87d..b675171ee3 100644
--- a/mingw-w64-libgpr/PKGBUILD
+++ b/mingw-w64-libgpr/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libgpr
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for GPRbuild project files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-liblktlang/PKGBUILD b/mingw-w64-liblktlang/PKGBUILD
index 19838a2228..fc80c90a7f 100644
--- a/mingw-w64-liblktlang/PKGBUILD
+++ b/mingw-w64-liblktlang/PKGBUILD
@@ -4,7 +4,7 @@ _realname=liblktlang
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python framework to generate language parsers (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -19,8 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-gnatcoll-iconv"
          "${MINGW_PACKAGE_PREFIX}-libvss"
          "${MINGW_PACKAGE_PREFIX}-prettier-ada")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada"
-             "${MINGW_PACKAGE_PREFIX}-gprbuild"
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild"
              "${MINGW_PACKAGE_PREFIX}-langkit"
              "${MINGW_PACKAGE_PREFIX}-langkit_support"
              "${MINGW_PACKAGE_PREFIX}-python-build"
diff --git a/mingw-w64-libvss/PKGBUILD b/mingw-w64-libvss/PKGBUILD
index b367f8ea49..17ac9c480d 100644
--- a/mingw-w64-libvss/PKGBUILD
+++ b/mingw-w64-libvss/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libvss
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A high level string and text processing library. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -13,10 +13,10 @@ msys2_references=(
 )
 license=('spdx:Apache-2.0 WITH LLVM-exception')
 url="https://github.com/AdaCore/VSS"
-makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gcc-ada"
          "${MINGW_PACKAGE_PREFIX}-xmlada")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild")
 source=("https://github.com/AdaCore/VSS/archive/v${pkgver}/libvss-${pkgver}.tar.gz")
 sha256sums=('70b3a6a2bfe36470466d6a2ed59e5bbc5451879777ea1759243741d930829f64')
 
diff --git a/mingw-w64-markdown/PKGBUILD b/mingw-w64-markdown/PKGBUILD
index 6f365aa2b3..ef59bca214 100644
--- a/mingw-w64-markdown/PKGBUILD
+++ b/mingw-w64-markdown/PKGBUILD
@@ -4,7 +4,7 @@ _realname=markdown
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Markdown parser for Ada (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-prettier-ada/PKGBUILD b/mingw-w64-prettier-ada/PKGBUILD
index fa0e27074d..2ee2bfcfcc 100644
--- a/mingw-w64-prettier-ada/PKGBUILD
+++ b/mingw-w64-prettier-ada/PKGBUILD
@@ -4,7 +4,7 @@ _realname=prettier-ada
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A high level string and text processing library. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -13,11 +13,11 @@ msys2_references=(
 )
 license=('spdx:Apache-2.0 WITH LLVM-exception')
 url="https://github.com/AdaCore/prettier-ada"
-makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gcc-ada"
          "${MINGW_PACKAGE_PREFIX}-gnatcoll-core"
          "${MINGW_PACKAGE_PREFIX}-libvss")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gprbuild")
 source=("https://github.com/AdaCore/prettier-ada/archive/v${pkgver}/prettier-ada-${pkgver}.tar.gz")
 sha256sums=('21782e6ddc031ae4b32fc42e7213fe0aed3377e895462bd7a279e38da6b60f1e')
 
diff --git a/mingw-w64-templates-parser/PKGBUILD b/mingw-w64-templates-parser/PKGBUILD
index c590652d00..f2af5cfc60 100644
--- a/mingw-w64-templates-parser/PKGBUILD
+++ b/mingw-w64-templates-parser/PKGBUILD
@@ -4,7 +4,7 @@ _realname=templates-parser
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Ada tools to create templated text streams, such as dynamic HTML documents (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
diff --git a/mingw-w64-xmlada/PKGBUILD b/mingw-w64-xmlada/PKGBUILD
index a7d1dfd48c..8729fe5a83 100644
--- a/mingw-w64-xmlada/PKGBUILD
+++ b/mingw-w64-xmlada/PKGBUILD
@@ -9,7 +9,7 @@ _realname=xmlada
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=25.0.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A full XML suite for Ada (mingw-w64)"
 arch=('any')