Update after major version bump

2 files changed, 22 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e920a55053c7..4f23f42146b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = dftd4-git
 	pkgdesc = A Generally Applicable Atomic-Charge Dependent London Dispersion Correction
-	pkgver = 2.4.0.r82.0419702
+	pkgver = 3.3.0.r162.3d8ef7a
 	pkgrel = 1
 	url = https://github.com/dftd4/dftd4
 	arch = x86_64
 	license = LGPL3
-	makedepends = git
 	makedepends = meson
 	makedepends = ninja
+	makedepends = git
 	depends = gcc-fortran
 	depends = openblas
 	depends = lapack
 	provides = dftd4
 	conflicts = dftd4
-	source = dftd4-git::git+https://github.com/dftd4/dftd4.git#branch=master
+	source = dftd4-git::git+https://github.com/dftd4/dftd4.git#branch=main
 	md5sums = SKIP
 
 pkgname = dftd4-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 925f1ea2a264..ea641e3b664d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,26 @@
 # Maintainer: Sebastian Ehlert  <awvwgk at gmail dot com>
 
 pkgname=dftd4-git
-pkgver=2.4.0.r82.0419702
+pkgver=3.3.0.r162.3d8ef7a
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/dftd4/dftd4"
 provides=('dftd4')
-depends=('gcc-fortran' 'openblas' 'lapack')
-makedepends=('git' 'meson' 'ninja')
+depends=('gcc-fortran'
+         'openblas'
+         'lapack')
+makedepends=('meson'
+             'ninja'
+             'git')
 conflicts=('dftd4')
 license=('LGPL3')
 pkgdesc="A Generally Applicable Atomic-Charge Dependent London Dispersion Correction"
-source=("${pkgname}::git+https://github.com/dftd4/dftd4.git#branch=master")
+source=("${pkgname}::git+https://github.com/dftd4/dftd4.git#branch=main")
 md5sums=('SKIP')
 
 pkgver() {
   cd "${pkgname}"
-  _parent_ver=$(git describe --tags --abbrev=0 | sed 's/\([^-]*-\)g/r\1/;s/-//g' | tr -d '[:alpha:]' )
+  _parent_ver=$(git describe --tags --abbrev=0 --match 'v*' | sed 's/\([^-]*-\)g/r\1/;s/-//g' | tr -d '[:alpha:]' )
   printf "%s.r%s.%s" \
          "${_parent_ver}" \
          "$(git rev-list --count HEAD)" \
@@ -24,17 +28,18 @@ pkgver() {
 }
 
 build() {
-  mkdir -p "${pkgname}"/_build
-  cd "${pkgname}"/_build
-  meson setup . .. \
-      --buildtype release \
-      --warnlevel 0 \
+  meson setup _build_${CARCH} "${pkgname}" \
+      --buildtype=release \
       --prefix=/usr \
-      -Dla_backend=openblas
-  ninja
+      -Dlapack=openblas
+  meson compile -C _build_${CARCH}
+}
+
+check() {
+  meson test -C _build_${CARCH} --num-processes=1
 }
 
 package() {
-  cd "${pkgname}"/_build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" \
+  meson install -C _build_${CARCH}
 }