From 298b55ad92903156f79f35c7906db18ef8b4295a Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 5 Sep 2017 13:18:08 +0300
Subject: [PATCH] Fixes for Ada packages.

---
 mingw-w64-gprbuild-bootstrap-git/PKGBUILD | 62 ++++++++++-------------
 mingw-w64-gprbuild-gpl/PKGBUILD           | 33 +++++-------
 mingw-w64-xmlada-gpl/PKGBUILD             | 16 +++---
 3 files changed, 47 insertions(+), 64 deletions(-)

diff --git a/mingw-w64-gprbuild-bootstrap-git/PKGBUILD b/mingw-w64-gprbuild-bootstrap-git/PKGBUILD
index a7f3ef794c827..b975f7181f28f 100644
--- a/mingw-w64-gprbuild-bootstrap-git/PKGBUILD
+++ b/mingw-w64-gprbuild-bootstrap-git/PKGBUILD
@@ -6,58 +6,52 @@
 _realname=gprbuild-bootstrap
 pkgbase=mingw-w64-${_realname}-git
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-git
-pkgver=r3202.51774659
+pkgver=r3206.f95f0c68
 pkgrel=1
 pkgdesc="Static GPRbuild to bootstrap XML/Ada and GPRbuild itself (mingw-w64)"
 arch=('any')
 url='https://github.com/AdaCore/gprbuild/'
 license=('GPL3')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=(
-  'git'
-  "${MINGW_PACKAGE_PREFIX}-gcc-ada"
-)
+makedepends=("git"
+             "${MINGW_PACKAGE_PREFIX}-gcc-ada")
 provides=("${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap")
-conflicts=(
-  "${MINGW_PACKAGE_PREFIX}-gprbuild"
-  "${MINGW_PACKAGE_PREFIX}-gprbuild-gpl"
-  "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap"
-)
+conflicts=("${MINGW_PACKAGE_PREFIX}-gprbuild"
+           "${MINGW_PACKAGE_PREFIX}-gprbuild-gpl"
+           "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap")
 source=('git+https://github.com/AdaCore/gprbuild.git'
         'git+https://github.com/AdaCore/xmlada.git')
-sha1sums=(SKIP SKIP)
-
+sha1sums=('SKIP'
+          'SKIP')
 
 pkgver() {
-    cd "$srcdir/gprbuild"
-    printf "r%s.%s" \
-        "$(git rev-list --count HEAD)" \
-        "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/gprbuild"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "$srcdir/gprbuild"
-
-    # GPRbuild hard-codes references to /usr/libexec, but ArchLinux packages
-    # must use /usr/lib instead.
-    sed -i 's/libexec/lib/g' doinstall gprbuild.gpr \
-        share/gprconfig/compilers.xml \
-        share/gprconfig/linker.xml \
-        share/gprconfig/gnat.xml
+  cd "${srcdir}/gprbuild"
+
+  # GPRbuild hard-codes references to ${MINGW_PREFIX}/libexec, but MINGW packages
+  # must use ${MINGW_PREFIX}/lib instead.
+  sed -i "s|libexec|lib|g" doinstall gprbuild.gpr \
+    share/gprconfig/compilers.xml \
+    share/gprconfig/linker.xml \
+    share/gprconfig/gnat.xml
 }
 
 build() {
-    cd "$srcdir/gprbuild"
-
-    export GNATMAKEFLAGS="-j$(nproc)"
-    export DESTDIR="$srcdir/bootstrap"
-    ./bootstrap.sh \
-        --prefix=${MINGW_PREFIX} \
-        --libexecdir=/lib \
-        --with-xmlada="$srcdir/xmlada"
+  cd "${srcdir}/gprbuild"
+
+  export GNATMAKEFLAGS="-j$(nproc)"
+  export DESTDIR="${srcdir}/bootstrap"
+  ./bootstrap.sh \
+    --prefix=${MINGW_PREFIX} \
+    --libexecdir=/lib \
+    --with-xmlada="${srcdir}/xmlada"
 }
 
 package() {
-    cd "$srcdir/bootstrap"
-    cp -a --no-preserve=ownership -- "$srcdir/bootstrap/${MINGW_PREFIX}" "$pkgdir"
+  cd "$srcdir/bootstrap"
+  cp -a --no-preserve=ownership -- "${srcdir}/bootstrap/${MINGW_PREFIX}" "${pkgdir}"
 }
diff --git a/mingw-w64-gprbuild-gpl/PKGBUILD b/mingw-w64-gprbuild-gpl/PKGBUILD
index f1782a5fa7bee..5c152f362c890 100644
--- a/mingw-w64-gprbuild-gpl/PKGBUILD
+++ b/mingw-w64-gprbuild-gpl/PKGBUILD
@@ -4,37 +4,30 @@
 _realname=gprbuild-gpl
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
+pkgver=2017
 pkgrel=1
-pkgver=2016
-pkgdesc="Software tool designed to help automate the construction of multi-language systems"
+pkgdesc="Software tool designed to help automate the construction of multi-language systems (mingw-w64)"
 arch=('any')
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname%-*}")
 license=('GPL3')
 url="http://www.adacore.com/gnatpro/toolsuite/gprbuild/"
-makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-gcc-ada"
-  "${MINGW_PACKAGE_PREFIX}-xmlada"
-  "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap-git"
-)
-depends=(
-  "${MINGW_PACKAGE_PREFIX}-gcc-ada"
-  "${MINGW_PACKAGE_PREFIX}-xmlada"
-)
-conflicts=(
-  "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap"
-)
-source=('http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8')
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada"
+             "${MINGW_PACKAGE_PREFIX}-xmlada"
+             "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap-git")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-ada"
+         "${MINGW_PACKAGE_PREFIX}-xmlada")
+conflicts=("${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap")
+source=("${_realname}"::"git+https://github.com/AdaCore/gprbuild.git#branch=gpl-${pkgver}"))
 sha256sums=('d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d')
 
-prepare()
-{
-  cd ${srcdir}/gprbuild-gpl-$pkgver-src
+prepare() {
+  cd ${srcdir}/gprbuild-gpl-${pkgver}-src
 
-#  ./bootstrap.sh
+  #./bootstrap.sh
 }
 
 build() {
-  cd ${srcdir}/gprbuild-gpl-$pkgver-src
+  cd ${srcdir}/gprbuild-gpl-${pkgver}-src
 
   ./configure \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-xmlada-gpl/PKGBUILD b/mingw-w64-xmlada-gpl/PKGBUILD
index d3817591624ae..598fc0a3b06bf 100644
--- a/mingw-w64-xmlada-gpl/PKGBUILD
+++ b/mingw-w64-xmlada-gpl/PKGBUILD
@@ -8,27 +8,22 @@
 _realname=xmlada-gpl
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
+pkgver=2017
 pkgrel=1
-pkgver=2014
-pkgdesc="A full XML suite for Ada"
+pkgdesc="A full XML suite for Ada (mingw-w64)"
 arch=('any')
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname%-*}")
 url="https://libre.adacore.com/libre/tools/xmlada/"
 license=('GPL3')
-makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-gcc-ada"
-  "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap-git"
-  "git"
-)
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada")
+             "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap-git")
 depends=()
 source=("${_realname}"::"git+https://github.com/AdaCore/xmlada.git#branch=gpl-${pkgver}")
 sha256sums=('SKIP')
 options=('strip')
 
-prepare()
-{
+prepare() {
   cd ${srcdir}/${_realname}
-
 }
 
 build() {
@@ -38,6 +33,7 @@ build() {
     --host=${MINGW_CHOST} \
     --prefix=${MINGW_PREFIX} \
     --enable-shared
+
   make
 }