Bump version to 2.9.0

2 files changed, 77 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b9c710f389d..ce0c309b3cd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,25 @@
 pkgbase = dune-common
-	pkgdesc = Build system, infrastructure and foundation classes
-	pkgver = 2.8.0
-	pkgrel = 6
+	pkgdesc = Infrastructure and foundation classes
+	pkgver = 2.9.0
+	pkgrel = 1
 	url = https://dune-project.org/modules/dune-common
 	arch = x86_64
 	license = custom:GPL2 with runtime exception
-	makedepends = cmake
-	makedepends = python-mpi4py
-	makedepends = python-numpy
-	makedepends = texlive-latexextra
-	makedepends = biber
+	makedepends = python-scikit-build
+	makedepends = python-ninja
 	makedepends = doxygen
 	makedepends = graphviz
 	makedepends = python-sphinx
-	makedepends = python-setuptools
-	makedepends = python-portalocker
-	source = https://dune-project.org/download/2.8.0/dune-common-2.8.0.tar.gz
-	source = https://dune-project.org/download/2.8.0/dune-common-2.8.0.tar.gz.asc
-	validpgpkeys = ABE52C516431013C5874107C3F71FE0770D47FFB
-	sha512sums = 81a9f2bd38aa158134ec7306d2b838d1330ce5410de78ca0b7f9d42e27af7324757a3c01fcffe948e58dc8f6fe9f78c33fd840d9ccc98a18f3565b5de35c2f59
-	sha512sums = SKIP
-
-pkgname = dune-common
+	makedepends = texlive-latexextra
+	makedepends = biber
 	depends = cmake
-	depends = openmpi
-	depends = python-docutils
 	depends = git
 	depends = lapack
+	depends = python-setuptools
+	depends = python-portalocker
+	depends = python-numpy
+	depends = python-mpi4py
+	depends = python-jinja
 	optdepends = vc: C++ Vectorization library
 	optdepends = texlive-latexextra: Type setting system
 	optdepends = doxygen: Generate the class documentation from C++ sources
@@ -35,21 +28,20 @@ pkgname = dune-common
 	optdepends = bash-completion: for completion when using bash
 	optdepends = parmetis: Parallel Graph Partitioning and Fill-reducing Matrix Ordering
 	optdepends = scotch: Software package and libraries for graph, mesh and hypergraph partitioning, static mapping, and sparse matrix block ordering
+	optdepends = tbb: High level abstract threading library
 	optdepends = man-db: manual pages for dune
-	provides = dune-ctest
-	provides = duneproject
+	optdepends = python-matplotlib: for Matplotlib rendering
+	optdepends = mayavi: for 3D plotting
 	provides = dunecontrol
-	provides = dunepackaging.py
+	provides = dune-ctest
 	provides = dune-git-whitespace-hook
+	provides = dunepackaging.py
+	provides = duneproject
 	provides = rmgenerated.py
-	provides = setup-dunepy.py
+	source = https://dune-project.org/download/2.9.0/dune-common-2.9.0.tar.gz
+	source = https://dune-project.org/download/2.9.0/dune-common-2.9.0.tar.gz.asc
+	validpgpkeys = E5B47782DE09813BCC3518E159DA94F1FC8FD313
+	sha512sums = 4d1f05ee7d5c2376f0fc782b4978596501eed0e7c6d6c68b3a37949a0141cf308b42a6df1b171804a9606907f6597039f28916731c1caa0c54a36775402e6e97
+	sha512sums = SKIP
 
-pkgname = python-dune-common
-	pkgdesc = Build system, infrastructure and foundation classes (python bindings)
-	depends = dune-common>=2.8.0
-	depends = python-portalocker
-	depends = python-numpy
-	depends = python-mpi4py
-	depends = python-setuptools
-	optdepends = python-matplotlib: for Matplotlib rendering
-	optdepends = mayavi: for 3D plotting
+pkgname = dune-common
diff --git a/PKGBUILD b/PKGBUILD
index 17ddb64900f7..c07eed923eec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,83 +1,76 @@
 # Maintainer: Josh Hoffer < hoffer dot joshua at gmail dot com >
 # Maintainer: Carlos Aznarán <caznaranl@uni.pe>
 # Contributor: Lukas Böger <dev___AT___lboeger___DOT___de>
-pkgbase=dune-common
-pkgname=(${pkgbase} python-${pkgbase})
-_tarver=2.8.0
-_tar="${_tarver}/${pkgbase}-${_tarver}.tar.gz"
-pkgver=${_tarver}
-pkgrel=6
-pkgdesc="Build system, infrastructure and foundation classes"
-arch=('x86_64')
-url="https://dune-project.org/modules/${pkgbase}"
+pkgname=dune-common
+_tarver=2.9.0
+_tar="${_tarver}/${pkgname}-${_tarver}.tar.gz"
+pkgver="${_tarver}"
+pkgrel=1
+pkgdesc="Infrastructure and foundation classes"
+arch=(x86_64)
+url="https://dune-project.org/modules/${pkgname}"
 license=('custom:GPL2 with runtime exception')
-makedepends=(cmake python-mpi4py python-numpy texlive-latexextra biber doxygen graphviz python-sphinx python-setuptools python-portalocker)
+depends=(cmake git lapack python-setuptools
+  python-portalocker python-numpy python-mpi4py python-jinja)
+makedepends=(python-scikit-build python-ninja doxygen graphviz python-sphinx texlive-latexextra biber)
+optdepends=('vc: C++ Vectorization library'
+  'texlive-latexextra: Type setting system'
+  'doxygen: Generate the class documentation from C++ sources'
+  'graphviz: Graph visualization software'
+  'inkscape: Conversion routines for generate PNG images'
+  'bash-completion: for completion when using bash'
+  'parmetis: Parallel Graph Partitioning and Fill-reducing Matrix Ordering'
+  'scotch: Software package and libraries for graph, mesh and hypergraph partitioning, static mapping, and sparse matrix block ordering'
+  'tbb: High level abstract threading library'
+  'man-db: manual pages for dune'
+  'python-matplotlib: for Matplotlib rendering'
+  'mayavi: for 3D plotting')
+provides=('dunecontrol' 'dune-ctest' 'dune-git-whitespace-hook' 'dunepackaging.py' 'duneproject' 'rmgenerated.py')
 source=(https://dune-project.org/download/${_tar}{,.asc})
-sha512sums=('81a9f2bd38aa158134ec7306d2b838d1330ce5410de78ca0b7f9d42e27af7324757a3c01fcffe948e58dc8f6fe9f78c33fd840d9ccc98a18f3565b5de35c2f59' 'SKIP')
-validpgpkeys=('ABE52C516431013C5874107C3F71FE0770D47FFB') # Markus Blatt (applied mathematician and DUNE core developer) <markus@dr-blatt.de>
+sha512sums=('4d1f05ee7d5c2376f0fc782b4978596501eed0e7c6d6c68b3a37949a0141cf308b42a6df1b171804a9606907f6597039f28916731c1caa0c54a36775402e6e97'
+  '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
   # https://salsa.debian.org/science-team/dune-common/-/blob/master/debian/patches/skip-dirs-starting-with-dot.patch
-  sed -i 's/^        $(find -H "$dir" -name $CONTROL | $GREP -v '\''dune-\[-_a-zA-Z\]\/dune-\[-a-zA-Z_\]\*-\[0-9\]\\{1,\\}.\[0-9\]\\{1,\\}\/'\'')/        $(find -H "$dir" -name '\''.?\*'\'' -prune -o -name $CONTROL -print | $GREP -v '\''dune-\[-_a-zA-Z\]\/dune-\[-a-zA-Z_\]\*-\[0-9\]\\{1,\\}.\[0-9\]\\{1,\\}\/'\'')/' ${pkgbase}-${_tarver}/lib/dunemodules.lib
-  # Not necessary to compile for build
-  # https://github.com/dune-project/dune-common/blob/master/doc/comm/CMakeLists.txt
-  sed -i 's/^add_executable(poosc08 "poosc08.cc")/#add_executable(poosc08 "poosc08.cc")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
-  sed -i 's/^target_link_libraries(poosc08 PUBLIC "dunecommon")/#target_link_libraries(poosc08 PUBLIC "dunecommon")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
-  sed -i 's/^add_executable(poosc08_test "poosc08_test.cc")/#add_executable(poosc08_test "poosc08_test.cc")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
-  sed -i 's/^target_link_libraries(poosc08_test PUBLIC "dunecommon")/#target_link_libraries(poosc08_test PUBLIC "dunecommon")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
-  sed -i 's/^add_executable(indexset "indexset.cc")/#add_executable(indexset "indexset.cc")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
-  sed -i 's/^target_link_libraries(indexset PUBLIC "dunecommon")/#target_link_libraries(indexset PUBLIC "dunecommon")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
-  sed -i 's/^add_dune_mpi_flags("poosc08;poosc08_test;indexset")/#add_dune_mpi_flags("poosc08;poosc08_test;indexset")/' ${pkgbase}-${_tarver}/doc/comm/CMakeLists.txt
+  sed -i 's/^        $(find -H "$dir" -name $CONTROL | $GREP -v '\''dune-\[-_a-zA-Z\]\/dune-\[-a-zA-Z_\]\*-\[0-9\]\\{1,\\}.\[0-9\]\\{1,\\}\/'\'')/        $(find -H "$dir" -name '\''.?\*'\'' -prune -o -name $CONTROL -print | $GREP -v '\''dune-\[-_a-zA-Z\]\/dune-\[-a-zA-Z_\]\*-\[0-9\]\\{1,\\}.\[0-9\]\\{1,\\}\/'\'')/' lib/dunemodules.lib
+  python -m venv --system-site-packages _skbuild/linux-${CARCH}-${_pyversion}/cmake-build/dune-env
 }
 
 build() {
-  cmake \
-    -S ${pkgbase}-${_tarver} \
-    -B build-cmake \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+  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 \
     -DENABLE_HEADERCHECK=ON \
     -DDUNE_ENABLE_PYTHONBINDINGS=ON \
     -DDUNE_PYTHON_INSTALL_LOCATION='none' \
-    -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE \
-    -DCMAKE_DISABLE_FIND_PACKAGE_PTScotch=TRUE \
-    -Wno-dev
-  cmake --build build-cmake --target all
-  cd build-cmake/python
-  python setup.py build
-}
+    -DDUNE_PYTHON_WHEELHOUSE="dist" \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE
 
-package_dune-common() {
-  depends=('cmake' 'openmpi' 'python-docutils' 'git' 'lapack')
-  provides=('dune-ctest' 'duneproject' 'dunecontrol' 'dunepackaging.py' 'dune-git-whitespace-hook' 'rmgenerated.py' 'setup-dunepy.py')
-  optdepends=('vc: C++ Vectorization library'
-    'texlive-latexextra: Type setting system'
-    'doxygen: Generate the class documentation from C++ sources'
-    'graphviz: Graph visualization software'
-    'inkscape: Conversion routines for generate PNG images'
-    'bash-completion: for completion when using bash'
-    'parmetis: Parallel Graph Partitioning and Fill-reducing Matrix Ordering'
-    'scotch: Software package and libraries for graph, mesh and hypergraph partitioning, static mapping, and sparse matrix block ordering'
-    'man-db: manual pages for dune')
-  DESTDIR="${pkgdir}" cmake --build build-cmake --target install sphinx_html
-  install -d ${pkgdir}/usr/share/doc/${pkgbase}/buildsystem
-  mv build-cmake/doc/buildsystem/html/* ${pkgdir}/usr/share/doc/${pkgbase}/buildsystem
-  install -Dm644 ${pkgbase}-${_tarver}/COPYING "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
-  cd "${pkgdir}"
-  rm -rf usr/python
-  find "${pkgdir}" -type d -empty -delete
+  cmake --build _skbuild/linux-${CARCH}-${_pyversion}/cmake-build --target sphinx_html
 }
 
-package_python-dune-common() {
-  depends=('dune-common>=2.8.0' 'python-portalocker' 'python-numpy' 'python-mpi4py' 'python-setuptools')
-  pkgdesc+=" (python bindings)"
-  optdepends=('python-matplotlib: for Matplotlib rendering'
-    'mayavi: for 3D plotting')
-  cd build-cmake/python
-  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+package() {
+  cd ${pkgname}-${pkgver}
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py --skip-cmake install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -d "${pkgdir}"/usr/share/doc/"${pkgname}"/buildsystem
+  mv _skbuild/linux-${CARCH}-${_pyversion}/cmake-build/doc/buildsystem/html/* "${pkgdir}"/usr/share/doc/${pkgname}/buildsystem
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  find "${pkgdir}" -type d -empty -delete
 }