Updated the PKGBUILD using the arch repo package

2 files changed, 56 insertions, 76 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f263a93bc167..06effce63478 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,75 @@
-# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
-# Contributor: Eric Engestrom <aur [at] engestrom [dot] ch>
+# Maintainer: Torge Matthies <openglfreak at googlemail dot com>
+# Contributor: Filipe Laíns (FFY00) <lains@archlinux.org>
 
+_pkgname=libratbag
 pkgname=libratbag-git
-pkgver=0.9.902.r34.e43cf7a
+pkgver=0.9.905.r30.cdd7010
 pkgrel=1
-pkgdesc='A library to configure gaming mice'
+pkgdesc='A DBus daemon to configure gaming mice - git version'
 arch=('x86_64')
 url='https://github.com/libratbag/libratbag'
 license=('MIT')
-depends=('glib2' 'libevdev' 'python'
-         'libsystemd.so' 'libudev.so')
-makedepends=('git' 'meson' 'swig' 'systemd')
-conflicts=('libratbag')
-provides=('libratbag')
+depends=('glib2' 'libevdev' 'libudev.so' 'python' 'python-evdev')
+makedepends=('meson' 'swig' 'git' 'python-sphinx' 'python-sphinx_rtd_theme')
+checkdepends=('check' 'valgrind' 'python-gobject' 'python-lxml')
 source=('git+https://github.com/libratbag/libratbag.git')
-sha256sums=('SKIP')
+sha512sums=('SKIP')
+provides=('libratbag' "libratbag=$pkgver" 'ratbagd' 'liblur')
+conflicts=('libratbag' 'ratbagd' 'liblur')
 
 pkgver() {
-  cd libratbag
+  cd "$srcdir/$_pkgname"
 
   git describe | sed 's/^v//; s/-/.r/; s/-g/./'
 }
 
+prepare() {
+  cd "$srcdir/$_pkgname"
+
+  sed -i 's|sphinx-build3|sphinx-build|' doc/meson.build
+}
+
 build() {
-  arch-meson libratbag build \
-    -Dtests='false'
-  ninja -C build
+  cd "$srcdir/$_pkgname"
+
+  mkdir -p build
+  cd build
+
+  local check
+  if (( CHECKFUNC )); then
+    check=true
+  else
+    check=false
+  fi
+
+  arch-meson .. \
+  	-Dsystemd-unit-dir=/usr/lib/systemd/system \
+  	-Ddocumentation=true \
+  	-Dtests="$check"
+
+  ninja
+}
+
+check() {
+  cd "$srcdir/$_pkgname"
+  
+  cd build
+
+  meson test --no-rebuild
 }
 
 package() {
-  DESTDIR="${pkgdir}" ninja -C build install
-  install -Dm 644 libratbag/COPYING -t "${pkgdir}"/usr/share/licenses/libratbag-git/
+  cd "$srcdir/$_pkgname"
+  
+  cd build
+
+  DESTDIR="$pkgdir" ninja install
+
+  # Install documentation
+  install -dm 755 "$pkgdir"/usr/share/doc/$pkgname
+  cp -r -a --no-preserve=ownership doc/html "$pkgdir"/usr/share/doc/$pkgname
+
+  # Install license
+  install -Dm 644 ../COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-# vim: ts=2 sw=2 et:
diff --git a/patch b/patch
deleted file mode 100644
index b6a7357a015c..000000000000
--- a/patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/PKGBUILD b/PKGBUILD
-index c9f347a..053a2fd 100644
---- a/PKGBUILD
-+++ b/PKGBUILD
-@@ -1,7 +1,8 @@
- # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
-+# Contributor: Eric Engestrom <aur [at] engestrom [dot] ch>
- 
- pkgname=libratbag-git
--pkgver=0.3.r18.765ee6c
-+pkgver=0.6.r18.b8ed1ea
- pkgrel=1
- pkgdesc='A library to configure gaming mice'
- arch=('i686' 'x86_64')
-@@ -9,9 +10,11 @@ url='https://github.com/libratbag/libratbag'
- license=('MIT')
- depends=('glibc' 'libevdev'
-          'libudev.so')
--makedepends=('chrpath' 'git' 'systemd')
-+makedepends=('chrpath' 'git' 'systemd' 'meson')
- source=('git+https://github.com/libratbag/libratbag.git')
- sha256sums=('SKIP')
-+conflicts=('libratbag')
-+provides=("libratbag=${pkgver%%.r*}")
- 
- pkgver() {
-   cd libratbag
-@@ -19,19 +22,26 @@ pkgver() {
-   git describe | sed 's/^v//; s/-/.r/; s/-g/./'
- }
- 
-+prepare() {
-+  cd libratbag
-+  rm -rf build
-+  meson build --prefix='/usr'
-+}
-+
- build() {
-   cd libratbag
-+  ninja -C build
-+}
- 
--  ./autogen.sh \
--    --prefix='/usr'\
--    --disable-static
--  make
-+check() {
-+  cd libratbag
-+  ninja -C build test
- }
- 
- package() {
-   cd libratbag
- 
--  make DESTDIR="${pkgdir}" install
-+  DESTDIR="${pkgdir}" ninja -C build install
-   chrpath -d "${pkgdir}"/usr/bin/ratbag-command
- 
-   install -dm 755 "${pkgdir}"/usr/share/licenses/libratbag-git