Drop 32-bit environments from some fortran-based packages

mingw-w64-calceph/PKGBUILD

@@ -5,21 +5,20 @@ pkgver=3.5.4
 pkgrel=1
 pkgdesc='The CALCEPH Library is designed to access the binary planetary ephemeris files, such INPOPxx and JPL DExxx ephemeris files (mingw-w64)'
 url='https://www.imcce.fr/inpop/calceph'
-license=('CeCILL-C' 'CeCILL-B' 'CeCILL')
+license=('spdx:CECILL-C OR CECILL-B OR CECILL-2.1')
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64' 'mingw32' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
 )
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
              "${MINGW_PACKAGE_PREFIX}-cc"
-             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-fortran")
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc")
 )
 source=("https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/${_realname}-${pkgver}.tar.gz")
 sha256sums=('c9a834e823cf376de6c0f826458b5f19555ed45dfd26880781e61a91849925b5')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   declare -a _extra_config

mingw-w64-fgsl/PKGBUILD

@@ -8,20 +8,19 @@ pkgrel=1
 gsl_required=2.6
 pkgdesc="Fortran interface to the GNU scientific library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'mingw32')
+mingw_arch=('mingw64' 'ucrt64')
+url="https://github.com/reinh-bader/fgsl"
 msys2_references=(
   'aur: fgsl-git'
 )
-url="https://github.com/reinh-bader/fgsl"
-license=('GPL')
+license=('spdx:GPL-2.0-or-later')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-gcc-fortran"
              "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
          "${MINGW_PACKAGE_PREFIX}-gsl>=${gsl_required}")
-options=('staticlibs' 'strip')
-source=("${_realname}-${pkgver}.tar.gz"::https://github.com/reinh-bader/fgsl/archive/${pkgver}.tar.gz)
+source=(https://github.com/reinh-bader/fgsl/archive/${pkgver}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('5013b4e000e556daac8b3c83192adfe8f36ffdc91d1d4baf0b1cb3100260e664')
 
 prepare() {
@@ -31,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \

mingw-w64-fortran-stdlib/PKGBUILD

@@ -7,7 +7,7 @@ pkgver=0.3.0
 pkgrel=1
 pkgdesc="Fortran Standard Library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'mingw32')
+mingw_arch=('mingw64' 'ucrt64')
 msys2_references=(
   'aur: fortran_stdlib'
 )
@@ -20,11 +20,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-fc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python-fypp")
-source=(${_realname}-${pkgver}.tar.gz::"https://github.com/fortran-lang/stdlib/archive/refs/tags/v${pkgver}.tar.gz")
+source=("https://github.com/fortran-lang/stdlib/archive/refs/tags/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('ca8ac7258d546045d317ed865c864a31141f6be5676b9332000b22bf975bdebf')
 
 build() {
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
@@ -33,6 +34,7 @@ build() {
       -G Ninja \
       -DBUILD_SHARED_LIBS=ON \
       ../stdlib-${pkgver}
+
   ${MINGW_PREFIX}/bin/cmake --build .
 }
 

mingw-w64-fpm/PKGBUILD

@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.9.0
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'mingw32')
+mingw_arch=('mingw64' 'ucrt64')
 pkgdesc="Fortran package manager (mingw-w64)"
 url="https://github.com/fortran-lang/fpm"
 license=('spdx:MIT')

mingw-w64-lapack/PKGBUILD

@@ -6,16 +6,14 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-blas"
          "${MINGW_PACKAGE_PREFIX}-cblas"
          "${MINGW_PACKAGE_PREFIX}-lapacke"
-         $([[ ${CARCH} == i686 ]] || echo \
-           "${MINGW_PACKAGE_PREFIX}-${_realname}64" \
-           "${MINGW_PACKAGE_PREFIX}-blas64" \
-           "${MINGW_PACKAGE_PREFIX}-cblas64" \
-           "${MINGW_PACKAGE_PREFIX}-lapacke64")
-         )
+         "${MINGW_PACKAGE_PREFIX}-${_realname}64"
+         "${MINGW_PACKAGE_PREFIX}-blas64"
+         "${MINGW_PACKAGE_PREFIX}-cblas64"
+         "${MINGW_PACKAGE_PREFIX}-lapacke64")
 pkgver=3.12.0
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="Linear Algebra PACKage (mingw-w64)"
 url="https://www.netlib.org/lapack"
 msys2_repository_url="https://github.com/Reference-LAPACK/lapack"
@@ -40,9 +38,6 @@ build() {
 
   for _shared in ON OFF; do
     for _index_64 in ON OFF; do
-      if [[ ${CARCH} == i686 && ${_index_64} == ON ]]; then
-        continue
-      fi
       MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
       ${MINGW_PREFIX}/bin/cmake.exe \
         -G"Ninja" \
@@ -67,9 +62,6 @@ check() {
   # Many of the tests for CBLAS are failing
   for _shared in ON OFF; do
     for _index_64 in ON OFF; do
-      if [[ ${CARCH} == i686 && ${_index_64} == ON ]]; then
-        continue
-      fi
       ${MINGW_PREFIX}/bin/cmake.exe \
         -DBUILD_TESTING=ON \
         -S ${_realname}-${pkgver} \

mingw-w64-plplot/PKGBUILD

@@ -13,9 +13,11 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.15.0
 pkgrel=22
-arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64' 'mingw32' 'clang32')
 pkgdesc="Scientific plotting software (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://plplot.sourceforge.io/"
+license=('spdx:LGPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
          $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
@@ -32,18 +34,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw-libs"
          "${MINGW_PACKAGE_PREFIX}-qhull"
         )
-makedepends=("${MINGW_PACKAGE_PREFIX}-libgd"
-             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-fortran")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-libgd"
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc")
              #"${MINGW_PACKAGE_PREFIX}-gcc-ada"
              "${MINGW_PACKAGE_PREFIX}-swig"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
-             "${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw")
 optdepends=("${MINGW_PACKAGE_PREFIX}-swig: connects Plplot C library to Python and Lua")
-license=('LGPL')
-url="https://plplot.sourceforge.io/"
 source=(https://downloads.sourceforge.net/sourceforge/plplot/${_realname}-${pkgver}.tar.gz
         find-gd.patch
         Include-wx-msw-wrapwin.h-instead-of-Windows.h.patch

mingw-w64-spooles/PKGBUILD

@@ -9,7 +9,7 @@ pkgver=2.2
 pkgrel=5
 pkgdesc="SParse Object Oriented Linear Equations Solver (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64' 'mingw32' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 depends=($([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ghostscript"