Verbump to 2.2.9

Plus a bunch of formatting changes to align with the vanilla PKGBUILD. Also
dropped ncurses as a makedepend (didn't notice that for the past year, lol).

2 files changed, 49 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db57e8899c66..4f00a9bfccea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mutt-slang
 	pkgdesc = Small but very powerful text-based mail client - slang version
-	pkgver = 2.2.8
+	pkgver = 2.2.9
 	pkgrel = 1
 	url = http://www.mutt.org/
 	arch = x86_64
@@ -12,13 +12,12 @@ pkgbase = mutt-slang
 	makedepends = gpgme
 	makedepends = krb5
 	makedepends = libidn2
+	makedepends = libsasl
 	makedepends = libxslt
 	makedepends = lynx
-	makedepends = ncurses
+	makedepends = openssl
 	depends = glibc
 	depends = libgpg-error
-	depends = openssl
-	depends = libsasl
 	depends = mime-types
 	depends = slang
 	depends = sqlite
@@ -30,24 +29,30 @@ pkgbase = mutt-slang
 	conflicts = mutt
 	options = debug
 	backup = etc/Muttrc
-	source = https://bitbucket.org/mutt/mutt/downloads/mutt-2.2.8.tar.gz
-	source = https://bitbucket.org/mutt/mutt/downloads/mutt-2.2.8.tar.gz.asc
+	source = https://bitbucket.org/mutt/mutt/downloads/mutt-2.2.9.tar.gz
+	source = https://bitbucket.org/mutt/mutt/downloads/mutt-2.2.9.tar.gz.asc
 	validpgpkeys = 8975A9B33AA37910385C5308ADEF768480316BDA
-	sha512sums = 7723dffd5fb0f6f1aa1ab22e90f101d0d8b9cd4f198a3ac7ebbba7a3c00e0f2163ce03075f48a6f288a81bf621204c8d8eb247a3fb216a5f7d37686b0e8b9fb2
+	sha512sums = d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f
 	sha512sums = SKIP
-	b2sums = cdbb2ba8971a6f9cf6f5ee8f1e666e835d1716957d001561c67fab6381041ce5f8c994dad6e2d83f76e47f1ea12033d55b2c5f61348369c740f224d80405c0e1
+	b2sums = 86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74
 	b2sums = SKIP
 
 pkgname = mutt-slang
 	depends = glibc
 	depends = libgpg-error
-	depends = openssl
-	depends = libsasl
 	depends = mime-types
 	depends = slang
 	depends = sqlite
 	depends = zlib
+	depends = gdbm
 	depends = libgdbm.so
+	depends = gpgme
 	depends = libgpgme.so
+	depends = krb5
 	depends = libgssapi_krb5.so
+	depends = libidn2
 	depends = libidn2.so
+	depends = libsasl
+	depends = libsasl2.so
+	depends = openssl
+	depends = libssl.so
diff --git a/PKGBUILD b/PKGBUILD
index 976e4e392889..1da63df7ccc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,15 @@
 
 _pkgbase=mutt
 pkgname=${_pkgbase}-slang
-pkgver=2.2.8
+pkgver=2.2.9
 pkgrel=1
 pkgdesc="Small but very powerful text-based mail client - slang version"
 arch=(x86_64)
 url="http://www.mutt.org/"
 license=(GPL2)
-depends=(glibc libgpg-error openssl libsasl mime-types slang sqlite zlib)
-makedepends=(docbook-xml docbook-xsl elinks gdbm gpgme krb5 libidn2 libxslt
-lynx ncurses)
+depends=(glibc libgpg-error mime-types slang sqlite zlib)
+makedepends=(docbook-xml docbook-xsl elinks gdbm gpgme krb5 libidn2 libsasl
+libxslt lynx openssl)
 provides=(mutt)
 conflicts=(mutt)
 optdepends=(
@@ -27,9 +27,9 @@ optdepends=(
 backup=(etc/Muttrc)
 options=(debug)
 source=(https://bitbucket.org/${_pkgbase}/${_pkgbase}/downloads/${_pkgbase}-$pkgver.tar.gz{,.asc})
-sha512sums=('7723dffd5fb0f6f1aa1ab22e90f101d0d8b9cd4f198a3ac7ebbba7a3c00e0f2163ce03075f48a6f288a81bf621204c8d8eb247a3fb216a5f7d37686b0e8b9fb2'
+sha512sums=('d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f'
             'SKIP')
-b2sums=('cdbb2ba8971a6f9cf6f5ee8f1e666e835d1716957d001561c67fab6381041ce5f8c994dad6e2d83f76e47f1ea12033d55b2c5f61348369c740f224d80405c0e1'
+b2sums=('86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74'
         'SKIP')
 validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA') # Kevin J. McCarthy <kevin@8t8.us>
 
@@ -39,29 +39,39 @@ prepare() {
 }
 
 build() {
-  cd "${_pkgbase}-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-debug \
-    --enable-gpgme \
-    --enable-pop \
-    --enable-imap \
-    --enable-smtp \
-    --enable-hcache \
-    --enable-sidebar \
-    --enable-autocrypt \
-    --with-slang=/usr \
-    --with-gss=/usr \
-    --with-ssl=/usr \
-    --with-sqlite3 \
-    --with-sasl \
+  local configure_options=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --enable-debug
+    --enable-gpgme
+    --enable-pop
+    --enable-imap
+    --enable-smtp
+    --enable-hcache
+    --enable-sidebar
+    --enable-autocrypt
+    --with-slang=/usr
+    --with-gss=/usr
+    --with-ssl=/usr
+    --with-sqlite3
+    --with-sasl
     --with-idn2
+  )
+
+  cd "${_pkgbase}-$pkgver"
+  ./configure "${configure_options[@]}"
   make
 }
 
 package() {
-  depends+=(libgdbm.so libgpgme.so libgssapi_krb5.so libidn2.so)
+  depends+=(
+    gdbm libgdbm.so
+    gpgme libgpgme.so
+    krb5 libgssapi_krb5.so
+    libidn2 libidn2.so
+    libsasl libsasl2.so
+    openssl libssl.so
+  )
 
   make DESTDIR="$pkgdir" install -C ${_pkgbase}-$pkgver
   install -vDm 644 ${_pkgbase}-$pkgver/contrib/gpg.rc "$pkgdir/etc/Muttrc.gpg.dist"