Bump version to 2.9.0

2 files changed, 48 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d3db9e326d8..9f737feaba6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
 pkgbase = dune-spgrid
 	pkgdesc = An efficient structured, parallel implementation of the DUNE grid interface
-	pkgver = 2.8.0
-	pkgrel = 2
-	url = https://www.dune-project.org/modules/dune-spgrid
+	pkgver = 2.9.0
+	pkgrel = 1
+	url = https://dune-project.org/modules/dune-spgrid
 	arch = x86_64
 	license = GPL
-	makedepends = dune-grid>=2.8.0
 	makedepends = doxygen
 	makedepends = graphviz
-	makedepends = python-setuptools
+	makedepends = python-scikit-build
+	makedepends = python-ninja
+	depends = dune-grid>=2.9.0
 	optdepends = doxygen: Generate the class documentation from C++ sources
 	optdepends = graphviz: Graph visualization software
-	source = https://gitlab.dune-project.org/extensions/dune-spgrid/-/archive/releases/2.8/dune-spgrid-releases-2.8.tar.gz
-	sha512sums = 557457b269372d29b655298f94bc78ef12eaf44dfbafa605dfd62146476893f5c7ccdda4322834a0fb4be900238adba3811b0b578dac702e52b7327e99647e76
+	source = https://dune-project.org/download/2.9.0/dune-spgrid-2.9.0.tar.gz
+	source = https://dune-project.org/download/2.9.0/dune-spgrid-2.9.0.tar.gz.asc
+	validpgpkeys = E5B47782DE09813BCC3518E159DA94F1FC8FD313
+	sha512sums = a9f973820009fba589b258f109499dd5b456673779fa66909e1de5b6caf8e767b9451fb490dd32ddb6436ef26abafa1c3219e3127b88abd5eea6dcc3b70b7e13
+	sha512sums = SKIP
 
 pkgname = dune-spgrid
-	depends = dune-grid>=2.8.0
-
-pkgname = python-dune-spgrid
-	pkgdesc = An efficient structured, parallel implementation of the DUNE grid interface (python bindings)
-	depends = dune-spgrid>=2.8.0
-	depends = python-dune-grid>=2.8.0
diff --git a/PKGBUILD b/PKGBUILD
index ddb9fb3aacfa..c6eedec84cc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,56 @@
 # Maintainer: Carlos Aznarán <caznaranl@uni.pe>
-pkgbase=dune-spgrid
-pkgname=(${pkgbase} python-${pkgbase})
-_tarver=2.8
-_tar="${_tarver}/${pkgbase}-releases-${_tarver}.tar.gz"
-pkgver=${_tarver}.0
-pkgrel=2
+pkgname=dune-spgrid
+_tarver=2.9.0
+_tar="${_tarver}/${pkgname}-${_tarver}.tar.gz"
+pkgver="${_tarver}"
+pkgrel=1
 pkgdesc="An efficient structured, parallel implementation of the DUNE grid interface"
-arch=('x86_64')
-url="https://www.dune-project.org/modules/${pkgbase}"
+arch=(x86_64)
+url="https://dune-project.org/modules/${pkgname}"
 license=('GPL')
-makedepends=('dune-grid>=2.8.0' 'doxygen' 'graphviz' 'python-setuptools')
+depends=("dune-grid>=${pkgver}")
+makedepends=(doxygen graphviz python-scikit-build python-ninja)
 optdepends=('doxygen: Generate the class documentation from C++ sources'
   'graphviz: Graph visualization software')
-source=(https://gitlab.dune-project.org/extensions/${pkgbase}/-/archive/releases/${_tar})
-sha512sums=('557457b269372d29b655298f94bc78ef12eaf44dfbafa605dfd62146476893f5c7ccdda4322834a0fb4be900238adba3811b0b578dac702e52b7327e99647e76')
+source=(https://dune-project.org/download/${_tar}{,.asc})
+sha512sums=('a9f973820009fba589b258f109499dd5b456673779fa66909e1de5b6caf8e767b9451fb490dd32ddb6436ef26abafa1c3219e3127b88abd5eea6dcc3b70b7e13' 'SKIP')
+validpgpkeys=('E5B47782DE09813BCC3518E159DA94F1FC8FD313') # Andreas Dedner <a.s.dedner@warwick.ac.uk>
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  export _pyversion=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
+  sed -i 's/^Version: '"${pkgver%%.0}"'-git/Version: '"${pkgver}"'/' dune.module
+  python -m venv --system-site-packages _skbuild/linux-${CARCH}-${_pyversion}/cmake-build/dune-env
+}
 
 build() {
-  cmake \
-    -S ${pkgbase}-releases-${_tarver} \
-    -B build-cmake \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+  cd ${pkgname}-${pkgver}
+
+  XDG_CACHE_HOME="${PWD}" \
+    python setup.py build \
+    --build-type=None \
+    -G 'Unix Makefiles' \
     -DBUILD_SHARED_LIBS=TRUE \
     -DCMAKE_CXX_STANDARD=17 \
     -DCMAKE_C_COMPILER=gcc \
     -DCMAKE_CXX_COMPILER=g++ \
+    -DCMAKE_C_FLAGS='-Wall -fdiagnostics-color=always' \
+    -DCMAKE_CXX_FLAGS="-O2 -Wall -fdiagnostics-color=always -mavx" \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \
+    -DALLOW_CXXFLAGS_OVERWRITE=ON \
+    -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=FALSE \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=FALSE \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=FALSE \
     -DENABLE_HEADERCHECK=ON \
     -DDUNE_ENABLE_PYTHONBINDINGS=ON \
     -DDUNE_PYTHON_INSTALL_LOCATION='none' \
-    -Wno-dev
-  cmake --build build-cmake --target all
-  cd "build-cmake/python"
-  python setup.py build
+    -DDUNE_PYTHON_WHEELHOUSE="dist"
 }
 
-package_dune-spgrid() {
-  depends=('dune-grid>=2.8.0')
-  DESTDIR="${pkgdir}" cmake --build build-cmake --target install
-  # install -Dm644 ${pkgbase}-releases-${_tarver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+package() {
+  cd ${pkgname}-${pkgver}
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py --skip-cmake install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
   find "${pkgdir}" -type d -empty -delete
 }
-
-package_python-dune-spgrid() {
-  depends=('dune-spgrid>=2.8.0' 'python-dune-grid>=2.8.0')
-  pkgdesc+=" (python bindings)"
-  cd "build-cmake/python"
-  export PYTHONHASHSEED=0
-  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-}