Adopt and update package

3 files changed, 60 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a2db36ac354..d9eee2045640 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,29 @@
 pkgbase = sirikali-git
 	pkgdesc = A Qt/C++ GUI front end to cryfs, gocryptfs, securefs and encfs
-	pkgver = 1.99.999
-	pkgrel = 2
+	pkgver = 1.2.5.r27.0b14bd6
+	pkgrel = 1
 	url = https://mhogomchungu.github.io/sirikali/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = qt5-base
 	makedepends = cmake
-	makedepends = libpwquality
 	makedepends = libgcrypt
-	makedepends = libsecret
-	makedepends = lxqt_wallet
+	makedepends = gcc-libs
+	depends = qt5-base
+	depends = libpwquality
+	depends = hicolor-icon-theme
+	optdepends = libsecret: support for Gnome libsecret password storage
+	optdepends = kwallet: support for KDE wallet storage
+	optdepends = cryfs: for CryFS support
+	optdepends = gocryptfs: for gocryptfs support
+	optdepends = securefs: for securefs support
+	optdepends = encfs: for EncFS support
+	optdepends = ecryptfs-simple: for eCryptfs support
 	provides = sirikali
 	conflicts = sirikali
 	source = sirikali::git+https://github.com/mhogomchungu/sirikali.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = sirikali-git
 
diff --git a/.gitignore b/.gitignore
index df9e34c8fb1a..c8b2d695c42b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-*.pkg.*
+*.pkg.tar.xz
 sirikali
-*.src.*
+src/*
+pkg/*
diff --git a/PKGBUILD b/PKGBUILD
index 8606289d24e3..6b3378756edb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,63 @@
-# Maintainer: Félix Saparelli <aur@passcod.name>
+# Maintainer: Conor Anderson <conor@conr.ca>
+# Adopted from: Félix Saparelli <aur@passcod.name>
 pkgname=sirikali-git
-pkgver=1.99.999
-pkgrel=2
+_pkgname=${pkgname%-git}
+pkgver=1.2.5.r27.0b14bd6
+pkgrel=1
 pkgdesc="A Qt/C++ GUI front end to cryfs, gocryptfs, securefs and encfs"
 arch=('i686' 'x86_64')
 url="https://mhogomchungu.github.io/sirikali/"
 license=('GPL')
-makedepends=('git' 'qt5-base' 'cmake' 'libpwquality' 'libgcrypt' 'libsecret' 'lxqt_wallet')
+depends=('qt5-base' 'libpwquality' 'hicolor-icon-theme')
+makedepends=('git' 'cmake' 'libgcrypt' 'gcc-libs')
+optdepends=('libsecret: support for Gnome libsecret password storage'
+            'kwallet: support for KDE wallet storage'
+            'cryfs: for CryFS support'
+            'gocryptfs: for gocryptfs support'
+            'securefs: for securefs support'
+            'encfs: for EncFS support'
+            'ecryptfs-simple: for eCryptfs support')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('sirikali::git+https://github.com/mhogomchungu/sirikali.git')
-noextract=()
-md5sums=('SKIP')
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+  cd "$srcdir/${_pkgname}"
+  printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 prepare() {
-	cd "$srcdir/${pkgname%-git}"
-	mkdir -p build
+  cd "$srcdir/${_pkgname}"
+  mkdir -p build
+
+  if pacman -Qs "kwallet" > /dev/null ; then
+    kdeopt="false"
+  else
+    kdeopt="true"
+  fi
+
+  if pacman -Qs "libsecret" > /dev/null ; then
+    gnomeopt="false"
+  else
+    gnomeopt="true"
+  fi
 }
 
 build() {
-	cd "$srcdir/${pkgname%-git}/build"
-	cmake \
-	  -DCMAKE_BUILD_TYPE=RELEASE \
-	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DINTERNAL_LXQT_WALLET=false \
-	  -DNOKDESUPPORT=false \
-	  -DNOSECRETSUPPORT=false \
-	  -DQT5=true \
-	  . ..
-	make
+  cd "$srcdir/${_pkgname}/build"
+  cmake \
+    -DCMAKE_BUILD_TYPE=RELEASE \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINTERNAL_LXQT_WALLET=true \
+    -DNOKDESUPPORT=$kdeopt \
+    -DNOSECRETSUPPORT=$gnomeopt \
+    -DQT5=true \
+    . ..
+  make
 }
 
 package() {
-	cd "$srcdir/${pkgname%-git}/build"
-	make DESTDIR="$pkgdir/" install
+  cd "$srcdir/${_pkgname}/build"
+  make DESTDIR="$pkgdir/" install
 }